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

[Agostino Sarubbo]

commit: 06b84384f23362128edda527f7b9c51f1c3e7626
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 31 07:59:09 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 31 07:59:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b84384

app-admin/collectd: amd64 stable wrt bug #628540

Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-admin/collectd/collectd-5.7.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild 
b/app-admin/collectd/collectd-5.7.2-r1.ebuild
index 24b2f9f7c0a..43537509b26 100644
--- a/app-admin/collectd/collectd-5.7.2-r1.ebuild
+++ b/app-admin/collectd/collectd-5.7.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${HOMEPAGE%/}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl 
selinux static-libs udev xfs"
 
 # The plugin lists have to follow here since they extend IUSE

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

[Mikhail Pukhlikov]

commit: fbf0ab9a915393b6cb700fc58c25ee3fd3c45467
Author: mpkh  gentoo  org>
AuthorDate: Tue Jan 30 17:37:10 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:37:10 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=fbf0ab9a

Merge pull request #370 from ArsenShnurkov/dev-dotnet/buildtools

dev-dotnet/buildtools

 ...tools-1.0.27.ebuild => buildtools-1.0.27-r1.ebuild} |  7 ---
 .../files/mono-Microsoft.DotNet.Build.Tasks.csproj | 18 --
 2 files changed, 16 insertions(+), 9 deletions(-)

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/msbuild-defaulttasks/

[Mikhail Pukhlikov]

commit: f60b038df30706e9ccb0a1e60257d07938a2fe36
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:40:21 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:40:21 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f60b038d

remove dependency

 .../msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild   | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild 
b/dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild
index 3516149..5552048 100644
--- a/dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild
+++ b/dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
+
 RESTRICT="mirror"
 KEYWORDS="~amd64"
 SLOT="0"
@@ -10,7 +11,7 @@ SLOT="0"
 USE_DOTNET="net46"
 IUSE="+${USE_DOTNET} gac developer debug doc"
 
-inherit dotnet gac
+inherit dotnet xbuild gac
 
 GITHUB_ACCOUNT="mono"
 GITHUB_PROJECTNAME="linux-packaging-msbuild"
@@ -27,11 +28,12 @@ COMMON_DEPEND=">=dev-lang/mono-5.2.0.196
dev-dotnet/system-reflection-metadata developer? ( 
dev-dotnet/system-reflection-metadata[developer] )
dev-dotnet/system-collections-immutable developer? ( 
dev-dotnet/system-collections-immutable[developer] )
 "
+
 RDEPEND="${COMMON_DEPEND}
 "
+
 DEPEND="${COMMON_DEPEND}
dev-dotnet/buildtools
-   >=dev-dotnet/msbuildtasks-1.5.0.240-r1
 "
 
 KEY2="${FILESDIR}/mono.snk"

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/buildtools/

[Mikhail Pukhlikov]

commit: 127f139c64347ec5722658eea631751a19cb9893
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:16:36 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:16:36 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=127f139c

rename and add xbuild.eclass

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

diff --git a/dev-dotnet/buildtools/buildtools-1.0.27.ebuild 
b/dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild
similarity index 98%
rename from dev-dotnet/buildtools/buildtools-1.0.27.ebuild
rename to dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild
index 222efe0..64b8baf 100644
--- a/dev-dotnet/buildtools/buildtools-1.0.27.ebuild
+++ b/dev-dotnet/buildtools/buildtools-1.0.27-r1.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 USE_DOTNET="net45"
 IUSE="+${USE_DOTNET} +gac developer debug doc +symlink"
 
-inherit dotnet gac mono-pkg-config
+inherit dotnet xbuild gac mono-pkg-config
 
 GITHUB_ACCOUNT="dotnet"
 GITHUB_PROJECTNAME="buildtools"

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

[Mikhail Pukhlikov]

commit: 7addd00b0e3f60e27ce42f943f390ee1559af102
Author: mpkh  gentoo  org>
AuthorDate: Tue Jan 30 17:36:46 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:36:46 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=7addd00b

Merge pull request #372 from ArsenShnurkov/dev-dotnet/system-reflection-metadata

dev-dotnet/system-reflection-metadata

 .../files/mono-System.Reflection.Metadata.csproj   | 24 +++---
 ...system-reflection-metadata-2.0.0_pre-r1.ebuild} |  8 
 2 files changed, 21 insertions(+), 11 deletions(-)

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-reflection-metadata/files/, ...

[Mikhail Pukhlikov]

commit: 5dc9db913566f7938918a1cd43bfb2ee10bf9710
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:34:32 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:34:32 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5dc9db91

remove dependency

 .../files/mono-System.Reflection.Metadata.csproj   | 24 +++---
 .../system-reflection-metadata-2.0.0_pre-r1.ebuild |  8 
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git 
a/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
 
b/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
index 6be48cd..afb18fd 100644
--- 
a/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
+++ 
b/dev-dotnet/system-reflection-metadata/files/mono-System.Reflection.Metadata.csproj
@@ -250,18 +250,28 @@
 
 
   
+  
+
+
+
+  
   
-  
   
   
 
   2.0.0.0
 
-
+
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+ 
+  
+
   
-  
-
-
-
-  
 

diff --git 
a/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
 
b/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
index 9ff1ecf..8a57c08 100644
--- 
a/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
+++ 
b/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
+
 RESTRICT="mirror"
 KEYWORDS="~amd64"
 SLOT="0"
@@ -10,7 +11,7 @@ SLOT="0"
 USE_DOTNET="net45"
 IUSE="+${USE_DOTNET} +gac developer debug doc"
 
-inherit gac dotnet
+inherit dotnet xbuild gac
 
 GITHUB_ACCOUNT="dotnet"
 GITHUB_PROJECTNAME="corefx"
@@ -29,7 +30,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
dev-dotnet/buildtools
-   >=dev-dotnet/msbuildtasks-1.5.0.240
 "
 
 PROJ1=System.Reflection.Metadata

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-reflection-metadata/

[Mikhail Pukhlikov]

commit: c7dbfe9c15a08fbd520774ce9cff643b23746f6d
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:31:11 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:31:11 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=c7dbfe9c

rename file

 ...ta-2.0.0_pre.ebuild => system-reflection-metadata-2.0.0_pre-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre.ebuild
 
b/dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild
similarity index 100%
rename from 
dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre.ebuild
rename to 
dev-dotnet/system-reflection-metadata/system-reflection-metadata-2.0.0_pre-r1.ebuild

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/buildtools/files/, dev-dotnet/buildtools/

[Mikhail Pukhlikov]

commit: 73c3cebd39282d884e0c04ce1c4b6919e8873bcb
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:12:09 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:12:09 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=73c3cebd

remove dependency

 dev-dotnet/buildtools/buildtools-1.0.27.ebuild |  5 +++--
 .../files/mono-Microsoft.DotNet.Build.Tasks.csproj | 18 --
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dev-dotnet/buildtools/buildtools-1.0.27.ebuild 
b/dev-dotnet/buildtools/buildtools-1.0.27.ebuild
index d7706b3..222efe0 100644
--- a/dev-dotnet/buildtools/buildtools-1.0.27.ebuild
+++ b/dev-dotnet/buildtools/buildtools-1.0.27.ebuild
@@ -2,9 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
+
 RESTRICT="mirror"
 KEYWORDS="~amd64"
+
 SLOT="0"
 
 USE_DOTNET="net45"
@@ -30,7 +32,6 @@ COMMON_DEPEND=">=dev-lang/mono-5.2.0.196
 RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
-   >=dev-dotnet/msbuildtasks-1.5.0.240
 "
 
 PROJ1=Microsoft.DotNet.Build.Tasks

diff --git 
a/dev-dotnet/buildtools/files/mono-Microsoft.DotNet.Build.Tasks.csproj 
b/dev-dotnet/buildtools/files/mono-Microsoft.DotNet.Build.Tasks.csproj
index a46b9cf..3a278c6 100644
--- a/dev-dotnet/buildtools/files/mono-Microsoft.DotNet.Build.Tasks.csproj
+++ b/dev-dotnet/buildtools/files/mono-Microsoft.DotNet.Build.Tasks.csproj
@@ -109,15 +109,21 @@
 
   
   
-  
   
 
1.0.27.0
 
-
+
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+  
+
+
   
 

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

[Mikhail Pukhlikov]

commit: 4494e65064ab02209bb9aa221ac9177f2047a1ee
Author: mpkh  gentoo  org>
AuthorDate: Tue Jan 30 18:36:54 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 18:36:54 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=4494e650

Merge pull request #373 from ArsenShnurkov/dev-dotnet/msbuild-defaulttasks

dev-dotnet/msbuild-defaulttasks

 ...asks-15.3-r2.ebuild => msbuild-defaulttasks-15.3-r3.ebuild} | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-collections-immutable/

[Mikhail Pukhlikov]

commit: d836a9069c2f358bb4fb27d1acf66890f5af6e7c
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:23:52 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:23:52 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=d836a906

rename ebuild

 ...-2.0.0_pre.ebuild => system-collections-immutable-2.0.0_pre-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre.ebuild
 
b/dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre-r1.ebuild
similarity index 100%
rename from 
dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre.ebuild
rename to 
dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre-r1.ebuild

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

[Mikhail Pukhlikov]

commit: ec076968c36e10b7fc5681781ea934c904e0640f
Author: mpkh  gentoo  org>
AuthorDate: Wed Jan 31 05:13:03 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Wed Jan 31 05:13:03 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=ec076968

Merge pull request #374 from ArsenShnurkov/dev-dotnet/msbuild-roslyn-csc

dev-dotnet/msbuild-roslyn-csc

 .../files/mono-MSBuildTask.csproj  | 22 ++
 3.ebuild => msbuild-roslyn-csc-15.3-r1.ebuild} |  7 +++
 2 files changed, 17 insertions(+), 12 deletions(-)

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/msbuild-roslyn-csc/files/, dev-dotnet/msbuild-roslyn-csc/

[Mikhail Pukhlikov]

commit: f461444a8748bc3f4b9f1385fc300fab2419287e
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 20:32:30 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 20:32:30 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=f461444a

dependency removal

 .../files/mono-MSBuildTask.csproj  | 22 ++
 3.ebuild => msbuild-roslyn-csc-15.3-r1.ebuild} |  7 +++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/dev-dotnet/msbuild-roslyn-csc/files/mono-MSBuildTask.csproj 
b/dev-dotnet/msbuild-roslyn-csc/files/mono-MSBuildTask.csproj
index 003b8b9..c2ce8ee 100644
--- a/dev-dotnet/msbuild-roslyn-csc/files/mono-MSBuildTask.csproj
+++ b/dev-dotnet/msbuild-roslyn-csc/files/mono-MSBuildTask.csproj
@@ -113,15 +113,21 @@
 
   
   
-  
   
 
-  15.3
+  15.3.0.0
 
-
+
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+  
+
+
   
-
\ No newline at end of file
+

diff --git a/dev-dotnet/msbuild-roslyn-csc/msbuild-roslyn-csc-15.3.ebuild 
b/dev-dotnet/msbuild-roslyn-csc/msbuild-roslyn-csc-15.3-r1.ebuild
similarity index 95%
rename from dev-dotnet/msbuild-roslyn-csc/msbuild-roslyn-csc-15.3.ebuild
rename to dev-dotnet/msbuild-roslyn-csc/msbuild-roslyn-csc-15.3-r1.ebuild
index 1aa4031..c38a85b 100644
--- a/dev-dotnet/msbuild-roslyn-csc/msbuild-roslyn-csc-15.3.ebuild
+++ b/dev-dotnet/msbuild-roslyn-csc/msbuild-roslyn-csc-15.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 RESTRICT="mirror"
@@ -11,7 +11,7 @@ SLOT="0"
 
 USE_DOTNET="net45"
 
-inherit dotnet
+inherit dotnet xbuild
 
 NAME="roslyn"
 HOMEPAGE="https://github.com/dotnet/${NAME};
@@ -32,7 +32,6 @@ COMMON_DEPEND=">=dev-lang/mono-5.4.0.167 

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

[Mikhail Pukhlikov]

commit: a217cfe7e205260da9725848e0acf5920a07305d
Author: mpkh  gentoo  org>
AuthorDate: Tue Jan 30 17:37:01 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:37:01 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=a217cfe7

Merge pull request #371 from 
ArsenShnurkov/dev-dotnet/system-collections-immutable

dev-dotnet/system-collections-immutable

 .../files/mono-System.Collections.Immutable.csproj | 22 --
 ...stem-collections-immutable-2.0.0_pre-r1.ebuild} |  8 
 2 files changed, 20 insertions(+), 10 deletions(-)

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/msbuild-defaulttasks/

[Mikhail Pukhlikov]

commit: ce28f67e4d0c34197adfd20a855217539d26943d
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:36:55 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:36:55 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=ce28f67e

rename file

 ...ld-defaulttasks-15.3-r2.ebuild => msbuild-defaulttasks-15.3-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r2.ebuild 
b/dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild
similarity index 100%
rename from dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r2.ebuild
rename to dev-dotnet/msbuild-defaulttasks/msbuild-defaulttasks-15.3-r3.ebuild

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-collections-immutable/files/, ...

[Mikhail Pukhlikov]

commit: 2efbca4649d8b2ac09150113bb4c5d2aa3a2
Author: ArsenShnurkov  users  noreply  github 
 com>
AuthorDate: Tue Jan 30 17:27:43 2018 +
Commit: Mikhail Pukhlikov  gentoo  org>
CommitDate: Tue Jan 30 17:27:43 2018 +
URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=2efbca46

remove dependency

 .../files/mono-System.Collections.Immutable.csproj | 22 --
 ...ystem-collections-immutable-2.0.0_pre-r1.ebuild |  8 
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git 
a/dev-dotnet/system-collections-immutable/files/mono-System.Collections.Immutable.csproj
 
b/dev-dotnet/system-collections-immutable/files/mono-System.Collections.Immutable.csproj
index cf547ed..4990140 100644
--- 
a/dev-dotnet/system-collections-immutable/files/mono-System.Collections.Immutable.csproj
+++ 
b/dev-dotnet/system-collections-immutable/files/mono-System.Collections.Immutable.csproj
@@ -107,17 +107,27 @@
 
 
   
+  
+
+
+  
   
-  
   
   
 
   2.0.0.0
 
-
+
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+  
+  
+<_Parameter1>$(VersionNumber)
+ 
+  
+
   
-  
-
-
-  
 

diff --git 
a/dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre-r1.ebuild
 
b/dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre-r1.ebuild
index a4ac334..f5dafb0 100644
--- 
a/dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre-r1.ebuild
+++ 
b/dev-dotnet/system-collections-immutable/system-collections-immutable-2.0.0_pre-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
+EAPI="6"
+
 RESTRICT="mirror"
 KEYWORDS="~amd64"
 SLOT="0"
@@ -10,7 +11,7 @@ SLOT="0"
 USE_DOTNET="net45"
 IUSE="+${USE_DOTNET} +gac developer debug doc"
 
-inherit gac dotnet
+inherit dotnet xbuild gac
 
 GITHUB_ACCOUNT="dotnet"
 GITHUB_PROJECTNAME="corefx"
@@ -28,7 +29,6 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
dev-dotnet/buildtools
-   >=dev-dotnet/msbuildtasks-1.5.0.240
 "
 
 PROJ1=System.Collections.Immutable

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/patron/

[Hans de Graaff]

commit: 7e264152d19853baf875bfe2477848bde9abc1be
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jan 31 06:00:07 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jan 31 06:00:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e264152

dev-ruby/patron: add 0.11.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-ruby/patron/Manifest |  1 +
 dev-ruby/patron/patron-0.11.1.ebuild | 44 
 2 files changed, 45 insertions(+)

diff --git a/dev-ruby/patron/Manifest b/dev-ruby/patron/Manifest
index 7d02beb7f66..9d674e419ea 100644
--- a/dev-ruby/patron/Manifest
+++ b/dev-ruby/patron/Manifest
@@ -1 +1,2 @@
 DIST patron-0.10.0.gem 59904 BLAKE2B 
f4ec8c81e4c0c13f3d3b5e0696955c01c8ff962980a8ed83ca7aaca722c422b0466a806af9b2c36f0183c16767f5b3f37dae4ae4a8801866592c8f861ba9778d
 SHA512 
bfe5fabbcbfa3d1c73ef6f79d100547de7e4121bcbd1f427423a127f0bc698bb8b6ade06c0e2eb1f529d1524e95fc36245b8be9d6e2c12b7e8d18b5f03ae6606
+DIST patron-0.11.1.gem 62976 BLAKE2B 
fc41865146876129eb824ccdd2351af8f0bb3bf099459becb87d0034291f864d576dda0c0ff017f0147eba88d7592dd5ce8ad3bb926db0d612e522a375a2c31a
 SHA512 
75a5705493f5496928279c751d396f9815bc47b4126ea8f9bcf9cabf7a40219b6f9cc2b12179d79848f616357552edcfe6b2b4312276bece432ed66a94ee8d63

diff --git a/dev-ruby/patron/patron-0.11.1.ebuild 
b/dev-ruby/patron/patron-0.11.1.ebuild
new file mode 100644
index 000..9d99ba9f6d3
--- /dev/null
+++ b/dev-ruby/patron/patron-0.11.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Patron is a Ruby HTTP client library based on libcurl"
+HOMEPAGE="https://toland.github.com/patron/;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND+=" net-misc/curl"
+RDEPEND+=" net-misc/curl"
+
+all_ruby_prepare() {
+   # Fix Rakefile
+   sed -i -e 's:rake/rdoctask:rdoc/task:' \
+   -e 's/README.txt/README.md/' \
+   -e '/bundler/I s:^:#:' \
+   -e '/extensiontask/ s:^:#:' \
+   -e '/ExtensionTask/,/^end/ s:^:#:' \
+   Rakefile || die
+
+   # Avoid specs with failures. We were not running any specs before.
+   rm spec/session_ssl_spec.rb spec/session_spec.rb spec/response_spec.rb 
|| die
+}
+
+each_ruby_configure() {
+   ${RUBY} -Cext/patron extconf.rb || die
+}
+
+each_ruby_compile() {
+   emake -Cext/patron V=1
+   cp ext/patron/session_ext$(get_modname) lib/patron/ || die "Unable to 
cp shared object file"
+}

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rspec-support/

[Hans de Graaff]

commit: 1a223c0614db81eee1220f4766837a1e2ebc76cc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Wed Jan 31 06:03:09 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Wed Jan 31 06:03:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a223c06

dev-ruby/rspec-support: add 3.7.1

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-ruby/rspec-support/Manifest   |  1 +
 dev-ruby/rspec-support/rspec-support-3.7.1.ebuild | 39 +++
 2 files changed, 40 insertions(+)

diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index b2a5fa103b1..fbc916baad7 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,3 +1,4 @@
 DIST rspec-support-3.5.0-git.tgz 59824 BLAKE2B 
8e970af2f060344f842664e3afad7ba18d6884ef4a0e5b47ca3f2544f27a80df7227b98e853fea5a1091a6727d075d6a033e23dae930bbad854a181f8aa1662a
 SHA512 
246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc
 DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 
9337da63047a1b33e8534a74a6dd4004287f0f057278b78160465ad66d43d5b543b9039d68e3488752e963308764b74a1343868f692b0ff26559b0c90cd3b674
 SHA512 
550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e
 DIST rspec-support-3.7.0-git.tgz 65675 BLAKE2B 
abc204f641014b16cbb433c10b5d5953c8fb1f94491bec359febb627ce1864776ab59e0b706ca908d00c79e75d8c95dc5c8673937c4bb24a2c7c90e6ec5f4e7e
 SHA512 
a4a3fc705d4c31d760777513f86d8b0ca4c9e540b0a6f4b6d1152676f252e1276fedebe7cd259f0dbbb60b447cc179eea194f3a3e5bb023907923cbf16fc8033
+DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 
8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53
 SHA512 
a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459

diff --git a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild 
b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
new file mode 100644
index 000..d53ae2925ed
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support;
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.7.0:3 dev-ruby/thread_order )"
+
+all_ruby_prepare() {
+   sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+   # Remove spec that, by following symlinks, tries to scan pretty much
+   # the whole filesystem.
+   rm spec/rspec/support/caller_filter_spec.rb || die
+
+   # Avoid spec that requires a dependency on git
+   sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb 
|| die
+
+   # Avoid a spec requiring a specific locale
+   sed -i -e '/copes with encoded strings/ 
s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+}

[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[Jeroen Roovers]

commit: 1b7539b31bbd4f6aab4d6a96d97de95a12a9b032
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 31 05:41:44 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 31 05:41:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b7539b3

x11-drivers/nvidia-drivers: Raise kernel version compatibility.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 x11-drivers/nvidia-drivers/nvidia-drivers-390.25.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.25.ebuild 
b/x11-drivers/nvidia-drivers/nvidia-drivers-390.25.ebuild
index 56562e2c520..6ff06f70016 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.25.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.25.ebuild
@@ -90,11 +90,11 @@ nvidia_drivers_versions_check() {
die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
fi
 
-   if use kernel_linux && kernel_is ge 4 15; then
+   if use kernel_linux && kernel_is ge 4 16; then
ewarn "Gentoo supports kernels which are supported by NVIDIA"
ewarn "which are limited to the following kernels:"
-   ewarn "

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

[Jeroen Roovers]

commit: 0168fd9190ac49b7c7d72d71540749bea93b6c14
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 31 04:44:02 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 31 04:44:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0168fd91

net-analyzer/argus: Clean up patch.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 net-analyzer/argus/files/argus-3.0.8.2-rpc.patch | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch 
b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
index 462d465609f..96af0caf140 100644
--- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
+++ b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
@@ -1,6 +1,5 @@
-diff -ruN argus-3.0.8.2.orig/common/Makefile.in 
argus-3.0.8.2/common/Makefile.in
 argus-3.0.8.2.orig/common/Makefile.in  2015-04-14 14:32:33.0 
-
-+++ argus-3.0.8.2/common/Makefile.in   2017-09-25 10:27:16.272856331 -
+--- a/common/Makefile.in
 b/common/Makefile.in
 @@ -35,12 +35,12 @@
  
  CC = @CC@
@@ -16,9 +15,8 @@ diff -ruN argus-3.0.8.2.orig/common/Makefile.in 
argus-3.0.8.2/common/Makefile.in
  
  INSTALL = @INSTALL@
  RANLIB = @V_RANLIB@
-diff -ruN argus-3.0.8.2.orig/configure.ac argus-3.0.8.2/configure.ac
 argus-3.0.8.2.orig/configure.ac2017-09-25 10:20:04.155174606 -
-+++ argus-3.0.8.2/configure.ac 2017-09-25 10:24:39.151904377 -
+--- a/configure.ac
 b/configure.ac
 @@ -120,6 +120,25 @@
  AC_CHECK_FUNCS(floorf remainderf)
  AC_CHECK_FUNCS(timegm)

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/argus-clients/files/, net-analyzer/argus-clients/

[Jeroen Roovers]

commit: 2321dd5c4aa02f5c83186193dfc558836c348811
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 31 04:35:08 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 31 04:35:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2321dd5c

net-analyzer/argus-clients: Use net-libs/libtirpc.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 .../argus-clients/argus-clients-3.0.8.2-r1.ebuild  | 73 ++
 ...ts-3.0.4.1-disable-tcp-wrappers-automagic.patch |  4 +-
 .../files/argus-clients-3.0.8.2-ar.patch   | 31 +
 .../files/argus-clients-3.0.8.2-rpc.patch  | 34 ++
 4 files changed, 140 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild 
b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild
new file mode 100644
index 000..4abbc598cf2
--- /dev/null
+++ b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Clients for net-analyzer/argus"
+HOMEPAGE="http://www.qosient.com/argus/;
+SRC_URI="http://qosient.com/argus/dev/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ft geoip mysql sasl tcpd"
+
+ARGUS_CDEPEND="
+   net-analyzer/rrdtool[perl]
+   net-libs/libpcap
+   net-libs/libtirpc:=
+   sys-libs/ncurses:=
+   sys-libs/readline:=
+   sys-libs/zlib
+   ft? ( net-analyzer/flow-tools )
+   geoip? ( dev-libs/geoip )
+   mysql? ( virtual/mysql )
+   sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="
+   ${ARGUS_CDEPEND}
+"
+DEPEND="
+   ${ARGUS_CDEPEND}
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch
+   "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch
+   "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch
+   "${FILESDIR}"/${PN}-3.0.8.2-ar.patch
+)
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   tc-export AR RANLIB
+
+   use debug && touch .debug
+   econf \
+   $(use_with ft libft) \
+   $(use_with geoip GeoIP /usr/) \
+   $(use_with sasl) \
+   $(use_with tcpd wrappers) \
+   $(use_with mysql)
+}
+
+src_compile() {
+   emake \
+   CCOPT="${CFLAGS} ${LDFLAGS}" \
+   RANLIB=$(tc-getRANLIB) \
+   CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)"
+}
+
+src_install() {
+   dobin bin/ra*
+   dodoc ChangeLog CREDITS README CHANGES
+   doman man/man{1,5}/*
+}

diff --git 
a/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
 
b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
index a08d974ce89..8e240043625 100644
--- 
a/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
+++ 
b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
@@ -1,5 +1,5 @@
 configure.ac.org   2011-01-28 18:26:54.0 +0100
-+++ configure.ac   2011-04-20 00:09:37.0 +0200
+--- a/configure.ac
 b/configure.ac
 @@ -121,6 +121,12 @@
  esac
  

diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch 
b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch
new file mode 100644
index 000..e5df5378ab1
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch
@@ -0,0 +1,31 @@
+--- a/common/Makefile.in
 b/common/Makefile.in
+@@ -113,23 +113,23 @@
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+-  rm -f $@; ar qc $@ $(COMMONOBJ)
++  rm -f $@; $(AR) qc $@ $(COMMONOBJ)
+   -$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-  rm -f $@; ar qc $@ $(PARSEOBJ)
++  rm -f $@; $(AR) qc $@ $(PARSEOBJ)
+   -$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_client.a: $(CLIENTOBJ)
+-  rm -f $@; ar qc $@ $(CLIENTOBJ)
++  rm -f $@; $(AR) qc $@ $(CLIENTOBJ)
+   -$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_output.a: $(OUTPUTOBJ)
+-  rm -f $@; ar qc $@ $(OUTPUTOBJ)
++  rm -f $@; $(AR) qc $@ $(OUTPUTOBJ)
+   -$(RANLIB) $@
+ 
+ @INSTALL_LIB@/argus_event.a: $(EVENTOBJ)
+-  rm -f $@; ar qc $@ $(EVENTOBJ)
++  rm -f $@; $(AR) qc $@ $(EVENTOBJ)
+   -$(RANLIB) $@
+ 
+ scanner.c: scanner.l

diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch 
b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
new file mode 100644
index 000..e140fa96b2a
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
 b/configure.ac
+@@ -40,6 +40,7 @@
+ AC_PROG_INSTALL
+ 

[gentoo-commits] proj/releng:master commit in: releases/weekly/portage/isos/package.use/, ...

[Jorge Manuel B. S. Vicetto]

commit: 5c963b7694972dd6db19dc234a33f2ed562b8e39
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo 
 org>
AuthorDate: Wed Jan 31 04:19:03 2018 +
Commit: Jorge Manuel B. S. Vicetto  gentoo  org>
CommitDate: Wed Jan 31 04:19:47 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c963b76

Disable new unstable depedencies for portage.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)  
gentoo.org>

 releases/weekly/portage/isos/package.use/portage  | 1 +
 releases/weekly/portage/stages/package.use/releng/portage | 1 +
 2 files changed, 2 insertions(+)

diff --git a/releases/weekly/portage/isos/package.use/portage 
b/releases/weekly/portage/isos/package.use/portage
new file mode 100644
index ..2dedcf80
--- /dev/null
+++ b/releases/weekly/portage/isos/package.use/portage
@@ -0,0 +1 @@
+sys-apps/portage -rsync-verify

diff --git a/releases/weekly/portage/stages/package.use/releng/portage 
b/releases/weekly/portage/stages/package.use/releng/portage
new file mode 100644
index ..2dedcf80
--- /dev/null
+++ b/releases/weekly/portage/stages/package.use/releng/portage
@@ -0,0 +1 @@
+sys-apps/portage -rsync-verify

[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/

[Jeroen Roovers]

commit: fc5311c8d7c7927dd4aedcda1cecef6dbb605102
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed Jan 31 03:42:08 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed Jan 31 03:42:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5311c8

x11-drivers/nvidia-drivers: Version 390.25.

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 x11-drivers/nvidia-drivers/Manifest|   6 +
 .../nvidia-drivers/nvidia-drivers-390.25.ebuild| 586 +
 2 files changed, 592 insertions(+)

diff --git a/x11-drivers/nvidia-drivers/Manifest 
b/x11-drivers/nvidia-drivers/Manifest
index 8181a9f82c9..bb07f894f2c 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -10,6 +10,7 @@ DIST NVIDIA-FreeBSD-x86-384.98.tar.gz 63653102 BLAKE2B 
003f293136a5a37a381ebe573
 DIST NVIDIA-FreeBSD-x86-387.22.tar.gz 64162390 BLAKE2B 
6d78c7d03a8e9b489f166f1a2216a5fc1afccd5bd96808c27c64b4155316de6e3f88258f720eb2dbf9218ca4027d5a3f3c6a5d959ac7f5f9d5c8522263f5620d
 SHA512 
3fb704aaa4080072e920dd19cd3492eb30e31ea2426e7f73939fd53072a92ace3dfbdbf582ca5c19bc27d1a52fbd6f9ab918c7f265e3c0a9c5e0905ad156548b
 DIST NVIDIA-FreeBSD-x86-387.34.tar.gz 64228643 BLAKE2B 
80011df5d037cd0a2a6faccf6c990e6019cb85c906c1410d4dde033a8a945ecd46e80a1315e46dc05fa47003eb328c6b8e8e41e18dce60942e645c0e6b813717
 SHA512 
875648459a149d506b20eb7105e73086e1fb51dddfbd8b484b8cc4793682c088ba16b3d374b0e807738f7aa7489dd9eab2449f70bc9feefeec0bf3a88025b9ef
 DIST NVIDIA-FreeBSD-x86-390.12.tar.gz 63855774 BLAKE2B 
220f7fb3d2fc2e9f4041b4139ab162a00a928b7eeeb57bbaaa0d836fb6bbfe818272e11cc1b6a8ecf0b369b111a44940f897872c0d8360eaad25a778cd8acd44
 SHA512 
c15724ed75375e21e50ac663feb798cadb897cc594fdc36d18f8b9bde2ac07b26002c1f170be0faadf4bb808ac387a5a4686c446f4191dd5f3e86bb8b7cd6c7c
+DIST NVIDIA-FreeBSD-x86-390.25.tar.gz 63975116 BLAKE2B 
9a8a512ee9942b08a698aadb350aaa690df9345f39326ea3bc6a735e7a8fb5cbc2a67a27a9496088c1f005b64bf1de667e08e530d038959300645ff4c0a41eed
 SHA512 
7e9b2ab143653159710a4a0669a43d20c42186693fa674c6e4f2c14aa555c448f8665e61d223554fcb15815d9da69ab6351c4fb209ae52d0b60b5c1b4f537d1f
 DIST NVIDIA-FreeBSD-x86_64-304.137.tar.gz 36474676 BLAKE2B 
bd75e2916d34f76566d838406419991a860118830366f0297fa63baade3a99f637dae601d6bc6a051596222f2715297dffbf9b81ff5478b030741e6c8a09bc13
 SHA512 
f0ae7ccea417aceedf34bfb9c96fd79b31cbf74a8fa59d5199b0ad7b81b8a4aeb66cd4801a45cc37f836979cb4267aa69e08517beaa9b8cb9c66a477d02ef8de
 DIST NVIDIA-FreeBSD-x86_64-340.104.tar.gz 61176133 BLAKE2B 
1fa2e1a7018b3d24b2a6b2be016aaa4c86196fba679d7032c9d0884900b4734ea1b6d54398bb7c792d5010496c86438eed134b8ac8c1aa235b336211fdc207e7
 SHA512 
d7535527fb9ffc820509da8d0b159c70627c72a7182c354448851a334fcd5b8835046d0e9812079af2fa92de0f3fce299a67e70ef50697a2a1f33b8d995e7f73
 DIST NVIDIA-FreeBSD-x86_64-340.106.tar.gz 61169129 BLAKE2B 
0a8e0deb883025d20df5165f39042bcee5d75ea78b19733cff014448c8d62022dbb98af2adebd13485e281a52c9a1c4986ae020b4eb6a821a411836e7333d4f1
 SHA512 
c2d0a0b1856522b28243697db22ad99d8521b00d9dfa2da724f2ee243b545b7dbf24319d9a0939855bab29251f001063391a760bd3db750bf9950ce1f9376847
@@ -22,6 +23,7 @@ DIST NVIDIA-FreeBSD-x86_64-384.98.tar.gz 62848100 BLAKE2B 
fa0ec45007ea4609280638
 DIST NVIDIA-FreeBSD-x86_64-387.22.tar.gz 63326641 BLAKE2B 
2d031738926a3f8691ae75b83d04e7965615c4de58736a0db2ee9c372b667cf8f841122bd37b48e6a64aa67b3892bf1f595267b1cb38019ce77ff4a2fe8d2f93
 SHA512 
ba4fe402f4dc7a5760af2f753cfcb7bf383d78df07c8ab7e53f22b6515c089f493abb4885adb23c119b4a8a9d5f83cbe248ef5877033a9a0c09c3ba59874f777
 DIST NVIDIA-FreeBSD-x86_64-387.34.tar.gz 63387097 BLAKE2B 
53689ba098b4a4de08dca056618ea533c92d17137ec954dea0ae71e1b2c825c021979871e4ff82c820be0a78d3c365f282b760940ebe2caa1ca5bfd2453e178e
 SHA512 
0a905ee72ee6f4e9c941e5dd1f7cddf96bfb20c6da32fd05599258e1bb154f68463d775ba8ff4f67f0d4b8e637e9ed9624fc9a4873a1f2621dc86732f0d6d70d
 DIST NVIDIA-FreeBSD-x86_64-390.12.tar.gz 6314 BLAKE2B 
56f6b2d5f3d456b02200a5e9571f91c4d2a1b97e2c051282cd8c0a42fc8c5b763e973975665e992da72692272c0ef0f6cf9a75d9e32ec56ea581b3a9a031d479
 SHA512 
e8a709f2b8bc0738971138dc77966247756a542974101f77b18e6a5dcd4a72c442b27122b0ffef10896530d8d94c57031c42772fb12e058bd73b98c60352cfcd
+DIST NVIDIA-FreeBSD-x86_64-390.25.tar.gz 63303401 BLAKE2B 
968fc854bcd37e91d7fa99aebaa0e49d3d1a293e8a20943f58727b73d048d6c4ceb3cf2fa46f0a858d75074bebfe91a8bdcf1b09d237723ee7f108fb633dc592
 SHA512 
859f1baa320e55a8c5bd7d06bc601733978a0aedfd841e19c88373ca18dc87cfd9ee8a1e2ae9af29dc37233eb0656a5d9e45d9a36cda4dad78e3e363c9f55a41
 DIST NVIDIA-Linux-armv7l-gnueabihf-375.82.run 26650801 BLAKE2B 
31446667065c56b48f6a3e737afe29a4517459d3462138136bffe383bc6fe514d6e80b49c391c27edc96b8abc3da3dd4d6ee3f3dca17f3c9a0f1cdf0e72cf099
 SHA512 
28554f1c24fe63c9257c0de3e84e4e739a45bf1c20ec7a53bc2c1b69b4e2355675061491ef5b03f3ae489cf623e553cfa68442f5536f137837327036d1c53d63
 DIST NVIDIA-Linux-armv7l-gnueabihf-378.13.run 26514235 BLAKE2B 

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

[Anthony G. Basile]

commit: b41e788f4fa2604d27d84f5e66d99d203edff76d
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Wed Jan 31 01:35:44 2018 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Wed Jan 31 01:36:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41e788f

dev-python/pyqt-distutils: initial commit

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-python/pyqt-distutils/Manifest |  1 +
 dev-python/pyqt-distutils/metadata.xml | 12 +++
 .../pyqt-distutils/pyqt-distutils-0.3.0.ebuild | 25 ++
 3 files changed, 38 insertions(+)

diff --git a/dev-python/pyqt-distutils/Manifest 
b/dev-python/pyqt-distutils/Manifest
new file mode 100644
index 000..6c49ef63612
--- /dev/null
+++ b/dev-python/pyqt-distutils/Manifest
@@ -0,0 +1 @@
+DIST pyqt-distutils-0.3.0.tar.gz 4659 BLAKE2B 
2897696881c6ee18558eb24a923b6675588bd38456fc4e9aff6b1780e7c2c31576c4a7427104c0b15238bed1ad52e2f13ab316441adb06fc0ffd9cbe5052ef30
 SHA512 
052a1fa0e687ac9aba5fc9623c72f8fff9a25f6d19083668e900ad1ff98bdd99c66c0ac45ba5f5f0c09b76a97370ebf4a4fef9fbd266bc0312bb05567c4ae577

diff --git a/dev-python/pyqt-distutils/metadata.xml 
b/dev-python/pyqt-distutils/metadata.xml
new file mode 100644
index 000..29ad84596c7
--- /dev/null
+++ b/dev-python/pyqt-distutils/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+bluen...@gentoo.org
+Anthony G. Basile
+  
+  
+pyqt-distutils
+ColinDuquesnoy/pyqt_distutils
+  
+

diff --git a/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild 
b/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
new file mode 100644
index 000..64d95f96b72
--- /dev/null
+++ b/dev-python/pyqt-distutils/pyqt-distutils-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+inherit distutils-r1
+
+DESCRIPTION="distutils extension to work with PyQt applications and UI files"
+HOMEPAGE="https://github.com/ColinDuquesnoy/pyqt_distutils;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+   ${DEPEND}
+   dev-python/docopt[${PYTHON_USEDEP}]
+"

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

[Patrick McLean]

commit: 6f3d79acd554da6385348b94032f35730b1c64c6
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Jan 31 01:04:17 2018 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Jan 31 01:04:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3d79ac

app-emulation/ganeti: Allow newer versions of sphinx

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 app-emulation/ganeti/ganeti-2.15.2-r6.ebuild  | 2 +-
 app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild 
b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index cb14808fba4..39a61a1f54f 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -136,7 +136,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
sys-devel/m4
app-text/pandoc
-   <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+   dev-python/sphinx[${PYTHON_USEDEP}]
media-fonts/urw-fonts
media-gfx/graphviz
>=dev-haskell/test-framework-0.6:0=

diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild 
b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 735e13c59f4..1ae893ae5ef 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -141,7 +141,7 @@ RDEPEND="${DEPEND}
 DEPEND+="
sys-devel/m4
app-text/pandoc
-   <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}]
+   dev-python/sphinx[${PYTHON_USEDEP}]
media-fonts/urw-fonts
media-gfx/graphviz
>=dev-haskell/test-framework-0.6:0=

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

[Andreas Sturmlechner]

commit: c3f06fdd6dc71c5f125f9da80c5f4fcd7e53839f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 30 23:30:39 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 31 00:45:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f06fdd

dev-qt/qtwebengine: 5.7.1-r2: Switch off USE=system-icu, fix dep

Fix build and ease dependency resolution with a future stable icu-60.2.

Bug: https://bugs.gentoo.org/618648
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
index 78b06c03f6e..78b9daea288 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg 
+system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg system-icu 
widgets"
 
 RDEPEND="
app-arch/snappy:=
@@ -59,7 +59,7 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
-   system-icu? ( dev-libs/icu:= )
+   system-icu? ( 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/ganeti/, app-emulation/ganeti/files/

[Patrick McLean]

commit: 384a630a875b79a9cef9e9286009fad5d0978296
Author: Patrick McLean  gentoo  org>
AuthorDate: Wed Jan 31 00:33:26 2018 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Jan 31 00:33:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384a630a

app-emulation/ganeti: Add patch to make build system respect HCFLAGS

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch | 12 
 app-emulation/ganeti/ganeti-2.15.2-r6.ebuild|  1 +
 app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild   |  3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch 
b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch
new file mode 100644
index 000..ffab1838bf1
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti-2.15-respect-HFLAGS.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.am b/Makefile.am
+index a04b95ae3..e26508ad9 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -803,6 +803,7 @@ HFLAGS = \
+   -fwarn-tabs \
+   -optP-include -optP$(HASKELL_PACKAGE_VERSIONS_FILE) \
+   -hide-all-packages \
++  $(HCFLAGS) \
+   `cat $(HASKELL_PACKAGE_IDS_FILE)` \
+   $(GHC_BYVERSION_FLAGS)
+ if DEVELOPER_MODE

diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild 
b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index 739b9186e2d..cb14808fba4 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -177,6 +177,7 @@ PATCHES+=(
"${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch"
"${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch"

"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
+   "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
 )
 
 S="${WORKDIR}/${MY_P}"

diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild 
b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index 5aee625621f..735e13c59f4 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -183,6 +183,7 @@ PATCHES+=(
"${FILESDIR}/${PN}-2.16-kvmd-run-as-daemon-user.patch"

"${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch"
"${FILESDIR}/fix_ftbfs_with_sphinx_1.4"
+   "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch"
 )
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] proj/releng:master commit in: releases/weekly/portage/isos/package.keywords/, ...

[Jorge Manuel B. S. Vicetto]

commit: 5288e396714ca67dbf48f17085178dbf3046fcd1
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto)  gentoo 
 org>
AuthorDate: Wed Jan 31 00:20:28 2018 +
Commit: Jorge Manuel B. S. Vicetto  gentoo  org>
CommitDate: Wed Jan 31 00:23:24 2018 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=5288e396

Keyword sys-apps/portage-2.3.21 to avoid the dependencies issues introduced 
with portage-2.3.19-r1.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto)  
gentoo.org>

 releases/weekly/portage/isos/package.keywords/portage   | 1 +
 releases/weekly/portage/stages/package.keywords/portage | 1 +
 2 files changed, 2 insertions(+)

diff --git a/releases/weekly/portage/isos/package.keywords/portage 
b/releases/weekly/portage/isos/package.keywords/portage
new file mode 100644
index ..f052c5ae
--- /dev/null
+++ b/releases/weekly/portage/isos/package.keywords/portage
@@ -0,0 +1 @@
+=sys-apps/portage-2.3.21

diff --git a/releases/weekly/portage/stages/package.keywords/portage 
b/releases/weekly/portage/stages/package.keywords/portage
new file mode 100644
index ..f052c5ae
--- /dev/null
+++ b/releases/weekly/portage/stages/package.keywords/portage
@@ -0,0 +1 @@
+=sys-apps/portage-2.3.21

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

[Andreas Sturmlechner]

commit: 7dac17e60ff82f818465642833e69e101a9e8b27
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 31 00:11:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 31 00:11:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dac17e6

dev-games/cegui: Fix build with ICU 59

Thanks-to: Lars Wendler (Polynomial-C)  gentoo.org>
Closes: https://bugs.gentoo.org/618968
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 dev-games/cegui/cegui-0.8.7.ebuild |  4 +++-
 dev-games/cegui/files/cegui-0.8.7-icu-59.patch | 11 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dev-games/cegui/cegui-0.8.7.ebuild 
b/dev-games/cegui/cegui-0.8.7.ebuild
index 95a092f7492..179c88599c4 100644
--- a/dev-games/cegui/cegui-0.8.7.ebuild
+++ b/dev-games/cegui/cegui-0.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -56,6 +56,8 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
opengl? ( media-libs/glm )"
 
+PATCHES=( "${FILESDIR}"/${P}-icu-59.patch )
+
 src_configure() {
# http://www.cegui.org.uk/mantis/view.php?id=991
append-ldflags $(no-as-needed)

diff --git a/dev-games/cegui/files/cegui-0.8.7-icu-59.patch 
b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
new file mode 100644
index 000..e64dfc97ab5
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.8.7-icu-59.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -72,7 +72,7 @@
+ 
+ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") OR (CMAKE_CXX_COMPILER_ID STREQUAL 
"Clang"))
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03")
++set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+ elseif (NOT CMAKE_VERSION VERSION_LESS "3.1")
+ set (CMAKE_C_STANDARD_REQUIRED TRUE)
+ set (CMAKE_C_STANDARD "99")

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

[Andreas Sturmlechner]

commit: 96c12e8961a79e7169ba777f2698c86205f66c88
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 31 00:12:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 31 00:12:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c12e89

dev-games/cegui: Drop old

Closes: https://bugs.gentoo.org/642496
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 dev-games/cegui/Manifest   |  2 -
 dev-games/cegui/cegui-0.6.2b.ebuild| 94 --
 dev-games/cegui/files/cegui-0.6.2b-dups.patch  | 12 
 dev-games/cegui/files/cegui-0.6.2b-gcc43.patch | 10 ---
 dev-games/cegui/files/cegui-0.6.2b-gcc46.patch | 10 ---
 5 files changed, 128 deletions(-)

diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index db3d26de83e..8f032e272ef 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -1,3 +1 @@
-DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 BLAKE2B 
d8638de6c13a6ae645c90345fad84dfd6a333d4e8047ccf67359e92b834da46d19612fce87eb0a071f35e4697eb9f2caf795e339f27d27a21b38b32eb5ffb101
 SHA512 
56ded923f21f18d837d71425e06fe8675a2efa979edde461a9e4e558c213cbb79ff8eeb576211da6ade56526ccdd9644a7a45b3619058615388e3882f96b9fb4
-DIST CEGUI-0.6.2b.tar.gz 2628081 BLAKE2B 
0f6d8e50e67dd849624a9c90fd050b0befe4f6a90a446a72d91ece853d291a99221d11f7dc891874958421d129c4d9f1059dccb276b37be050bfc8f5ca35528a
 SHA512 
52ed7e7a97024138af957815a396dda74b650e7c53542d2d48c5eb95335bec270abca3685c49b05078f4338079334df6bfbcec75e9b7eb21ee40bdbff5f57b20
 DIST cegui-0.8.7.tar.bz2 18114465 BLAKE2B 
cf0a4867f0e32c6a6b585821c915dc1fbd532e0f95effe28f6d3e4f1a2bccd23f47c7c33a3115befdf8b3f094d49a5af042d28c1e1fbb88e7c7f6da7f3fa173b
 SHA512 
271ff2a1e19f46c7d40cbc210bc665666e45b56cd0efea460db4d08df134d929337846eaf923db1b915597965aab27ad39512d6567cc63ef883555cbff542e56

diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild 
b/dev-games/cegui/cegui-0.6.2b.ebuild
deleted file mode 100644
index 0913935294e..000
--- a/dev-games/cegui/cegui-0.6.2b.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=CEGUI-${PV%b}
-DESCRIPTION="Crazy Eddie's GUI System"
-HOMEPAGE="http://www.cegui.org.uk/;
-SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}b.tar.gz
-   doc? ( mirror://sourceforge/crayzedsgui/${MY_P}-DOCS.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug devil directfb doc examples expat irrlicht lua opengl xerces-c xml"
-
-RDEPEND="dev-libs/libpcre
-   media-libs/freetype:2
-   devil? ( media-libs/devil )
-   directfb? ( dev-libs/DirectFB )
-   expat? ( dev-libs/expat )
-   irrlicht? ( dev-games/irrlicht )
-   lua? (
-   dev-lang/lua:0
-   dev-lua/toluapp
-   )
-   opengl? (
-   virtual/opengl
-   media-libs/freeglut
-   media-libs/glew:=
-   )
-   xerces-c? ( dev-libs/xerces-c )
-   xml? ( dev-libs/libxml2 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-gcc43.patch \
-   "${FILESDIR}"/${P}-dups.patch \
-   "${FILESDIR}"/${P}-gcc46.patch
-   sed -i \
-   -e 's/ILvoid/void/g' \
-   ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp || 
die
-   if use examples ; then
-   cp -r Samples Samples.clean || die
-   rm -f $(find Samples.clean -name 'Makefile*') || die
-   rm -rf Samples.clean/bin || die
-   fi
-   eautoreconf #220040
-}
-
-src_configure() {
-   econf \
-   $(use_enable debug) \
-   $(use_enable devil) \
-   $(use_enable directfb directfb-renderer) \
-   $(use_enable examples samples) \
-   $(use_enable expat) \
-   $(use_enable irrlicht irrlicht-renderer) \
-   $(use_enable lua external-toluapp) \
-   $(use_enable lua lua-module) \
-   $(use_enable lua toluacegui) \
-   $(use_enable opengl external-glew) \
-   $(use_enable opengl opengl-renderer) \
-   $(use_enable xerces-c) \
-   $(use_enable xml libxml) \
-   --enable-static \
-   --enable-tga \
-   --enable-tinyxml \
-   --disable-corona \
-   --disable-dependency-tracking \
-   --disable-external-tinyxml \
-   --disable-freeimage \
-   --disable-samples \
-   --disable-silly \
-   --without-gtk2 \
-   --without-ogre-renderer
-}
-
-src_install() {
-   default
-   if use doc ; then
-   dohtml -r documentation/api_reference
-   dodoc documentation/*.pdf
-   fi
-   if use examples ; 

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

[Andreas Sturmlechner]

commit: 7fdb1976e5254305f2663a280b5508889fa0ff93
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 30 22:50:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 30 23:21:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fdb1976

net-analyzer/linkchecker: Sync w/ 9.3.1 ebuild, drop USE=X

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 net-analyzer/linkchecker/linkchecker-.ebuild | 51 ++--
 1 file changed, 13 insertions(+), 38 deletions(-)

diff --git a/net-analyzer/linkchecker/linkchecker-.ebuild 
b/net-analyzer/linkchecker/linkchecker-.ebuild
index 82cfea75b98..bf89b20f35c 100644
--- a/net-analyzer/linkchecker/linkchecker-.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-.ebuild
@@ -1,48 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite?"
 
+EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git;
 inherit bash-completion-r1 distutils-r1 eutils git-r3 multilib
 
-MY_P="${P/linkchecker/LinkChecker}"
-
 DESCRIPTION="Check websites for broken links"
-HOMEPAGE="https://wummel.github.com/linkchecker/ 
https://pypi.python.org/pypi/linkchecker/;
+HOMEPAGE="https://github.com/linkcheck/linkchecker;
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/wummel/linkchecker.git;
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gnome sqlite X"
+IUSE="gnome sqlite"
 
 RDEPEND="
virtual/python-dnspython[${PYTHON_USEDEP}]
gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-   X? (
-   dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-   dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-   )"
-DEPEND="
-   X? (
-   dev-qt/qthelp:4
-   dev-python/markdown2[${PYTHON_USEDEP}]
-   )"
+"
+DEPEND=""
 
 RESTRICT="test"
 
 python_prepare_all() {
-   local PATCHES=(
-   "${FILESDIR}"/${PN}-9.2-unbundle.patch
-   "${FILESDIR}"/${PN}-9.3-bash-completion.patch
-   "${FILESDIR}"/${PN}-9.3-desktop.patch
-   )
-
-   emake -C doc/html
+   local PATCHES=( "${FILESDIR}"/${PN}-9.3-bash-completion.patch )
 
distutils-r1_python_prepare_all
 }
@@ -52,26 +37,16 @@ python_install_all() {
doc/upgrading.txt
doc/python3.txt
doc/changelog.txt
-   doc/development.txt
+   doc/development.mdwn
)
distutils-r1_python_install_all
-   if ! use X; then
-   delete_gui() {
-   rm -rf \
-   "${ED}"/usr/bin/linkchecker-gui* \
-   
"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-   }
-   python_foreach_impl delete_gui
-   rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-   fi
-
-   rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
 
-   newicon doc/html/logo64x64.png ${PN}.png
+   rm "${ED}"/usr/share/applications/linkchecker.desktop || die
 
-   docinto html
-   dodoc doc/html/*
newbashcomp config/linkchecker-completion ${PN}
+}
+
+pkg_postinst() {
optfeature "bash-completion support" 
dev-python/argcomplete[${PYTHON_USEDEP}]
optfeature "Virus scanning" app-antivirus/clamav
optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]

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

[Andreas Sturmlechner]

commit: 83a236efa0f92cd887c47c27fb17cd73ab04f090
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 30 23:13:22 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 30 23:21:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a236ef

net-analyzer/linkchecker: Drop USE=X

Bug: https://bugs.gentoo.org/634972
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 .../linkchecker/linkchecker-9.3.1-r1.ebuild| 32 --
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild 
b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index 109499f785b..2587e19ebf2 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -15,21 +15,14 @@ 
SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
-IUSE="gnome sqlite X"
+IUSE="gnome sqlite"
 
 RDEPEND="
virtual/python-dnspython[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-   X? (
-   dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-   dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}]
-   )"
-DEPEND="
-   X? (
-   dev-qt/qthelp:4
-   dev-python/markdown2[${PYTHON_USEDEP}]
-   )"
+"
+DEPEND=""
 
 RESTRICT="test"
 
@@ -37,7 +30,6 @@ python_prepare_all() {
local PATCHES=(
"${FILESDIR}/${PN}-9.2-unbundle.patch"
"${FILESDIR}/${PN}-9.3-bash-completion.patch"
-   "${FILESDIR}/${PN}-9.3-desktop.patch"
"${FILESDIR}/${PN}-9.3.1-build-fix.patch"
"${FILESDIR}/${PN}-9.3.1-requests.patch"
)
@@ -46,6 +38,12 @@ python_prepare_all() {
 }
 
 python_install_all() {
+   delete_gui() {
+   rm -rf \
+   "${ED}"/usr/bin/linkchecker-gui* \
+   "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
+   }
+
DOCS=(
doc/upgrading.txt
doc/python3.txt
@@ -53,17 +51,9 @@ python_install_all() {
doc/development.txt
)
distutils-r1_python_install_all
-   if ! use X; then
-   delete_gui() {
-   rm -rf \
-   "${ED}"/usr/bin/linkchecker-gui* \
-   
"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-   }
-   python_foreach_impl delete_gui
-   rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
-   fi
 
-   rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die
+   python_foreach_impl delete_gui
+   rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die
 
newicon doc/html/logo64x64.png ${PN}.png
 

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

[Andreas Sturmlechner]

commit: af1d571a6cbacf7c0628c60318a5302dfb687f8e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 30 23:18:32 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 30 23:21:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1d571a

net-analyzer/linkchecker: Sort RDEPENDs

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild 
b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index 9fc75eb9eff..77b392d670e 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -18,8 +18,8 @@ KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris"
 IUSE="gnome sqlite"
 
 RDEPEND="
-   virtual/python-dnspython[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
+   virtual/python-dnspython[${PYTHON_USEDEP}]
gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
 "
 DEPEND=""

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

[Andreas Sturmlechner]

commit: 21b16c5cb6af95fc01e1120a02b5bc60b658e2af
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 30 23:16:15 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 30 23:21:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b16c5c

net-analyzer/linkchecker: optfeature to pkg_postinst

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild 
b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index 2587e19ebf2..19003ce32e1 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -60,6 +60,9 @@ python_install_all() {
docinto html
dodoc doc/html/*
newbashcomp config/linkchecker-completion ${PN}
+}
+
+pkg_postinst() {
optfeature "bash-completion support" 
dev-python/argcomplete[${PYTHON_USEDEP}]
optfeature "Virus scanning" app-antivirus/clamav
optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}]

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

[Andreas Sturmlechner]

commit: 415de512753bd07cac0c391505faaffc0384095a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 30 23:16:59 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 30 23:21:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=415de512

net-analyzer/linkchecker: Drop unused multilib.eclass

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild | 2 +-
 net-analyzer/linkchecker/linkchecker-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild 
b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
index 19003ce32e1..9fc75eb9eff 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite?"
 
-inherit bash-completion-r1 distutils-r1 eutils multilib
+inherit bash-completion-r1 distutils-r1 eutils
 
 DESCRIPTION="Check websites for broken links"
 HOMEPAGE="https://github.com/linkcheck/linkchecker;

diff --git a/net-analyzer/linkchecker/linkchecker-.ebuild 
b/net-analyzer/linkchecker/linkchecker-.ebuild
index bf89b20f35c..38439a0d7a1 100644
--- a/net-analyzer/linkchecker/linkchecker-.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite?"
 
 EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git;
-inherit bash-completion-r1 distutils-r1 eutils git-r3 multilib
+inherit bash-completion-r1 distutils-r1 eutils git-r3
 
 DESCRIPTION="Check websites for broken links"
 HOMEPAGE="https://github.com/linkcheck/linkchecker;

[gentoo-commits] repo/gentoo:master commit in: app-doc/diveintopython/

[Patrice Clement]

commit: 6f3c4284283ac6aa93999c286ccb350faad248c8
Author: tharvik  users  noreply  github  com>
AuthorDate: Sun Jan 28 18:45:13 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan 30 22:20:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f3c4284

app-doc/diveintopython: remove invalid KEYWORDS.

Package-Manager: Portage-2.3.13, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6990

 app-doc/diveintopython/diveintopython-2.ebuild | 8 ++--
 app-doc/diveintopython/diveintopython-3.ebuild | 8 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app-doc/diveintopython/diveintopython-2.ebuild 
b/app-doc/diveintopython/diveintopython-2.ebuild
index 42e749bb499..391c52aba09 100644
--- a/app-doc/diveintopython/diveintopython-2.ebuild
+++ b/app-doc/diveintopython/diveintopython-2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,15 +16,11 @@ pdf? ( 
http://www.diveintopython.net/download/${PN}-pdf-${MY_PV}.zip -> ${P}-pdf
 LICENSE="FDL-1.1"
 SLOT="2"
 
-KEYWORDS="*"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="pdf"
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-   default
-}
-
 src_install() {
insinto "/usr/share/doc/${PN}-${SLOT}"
use pdf && dodoc "${PN}.pdf"

diff --git a/app-doc/diveintopython/diveintopython-3.ebuild 
b/app-doc/diveintopython/diveintopython-3.ebuild
index c2ed7f31156..bc2f6bfcc2c 100644
--- a/app-doc/diveintopython/diveintopython-3.ebuild
+++ b/app-doc/diveintopython/diveintopython-3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,13 +13,9 @@ 
SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="3"
-KEYWORDS="*"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="pdf"
 
-src_prepare() {
-   default
-}
-
 src_install() {
insinto "/usr/share/doc/${PN}-${SLOT}"
use pdf && dodoc "${P}.pdf"

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

[Patrice Clement]

commit: c3795d031a4b2bec97212a6a65a88390759b544a
Author: Mykyta Holubakha  gmail  com>
AuthorDate: Thu Jan 25 22:11:30 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan 30 22:18:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3795d03

media-video/syncplay: version bump to 1.5.1.

Closes: https://github.com/gentoo/gentoo/pull/6963

 media-video/syncplay/Manifest  |  1 +
 media-video/syncplay/syncplay-1.5.1.ebuild | 59 ++
 2 files changed, 60 insertions(+)

diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index 489af39aaaf..4bbe1ba2982 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1,2 +1,3 @@
 DIST syncplay-1.4.0.tar.gz 539743 BLAKE2B 
52eeb80480783c827538aa9c7bde1bf9516ae1219600e6be42eb8e0477c2b6377e6b2d0e950bd83367cca55d8aad47bb756d820b795d3354465e3e4989aec1ea
 SHA512 
2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a
 DIST syncplay-1.5.0.tar.gz 1588514 BLAKE2B 
0f2bddf3500758c3081bdba993b21fe60a0d3af7081c5edd0f684e1d60a2a95edce133a597e79747350e681dd40768226226f0b26e295850a8c218107b1da3e9
 SHA512 
8a57add8a845c041c02147415fc4b7941a41edfb80fc037c3af4e246d9ca6391be9f3886407470b1b51b8783ad6306e42bb34991e7cbb08eea87e781e3cd2200
+DIST syncplay-1.5.1.tar.gz 1603524 BLAKE2B 
0d7edb0c2129f67ce457cffb57f5600d0c0d6bee017119efc866d748f63e6e984becd21f88324e19dcac3f0ce52e2e2f1bf65326aab6237ea41b04bdecf26334
 SHA512 
8d7f99132b49148003dcdc83b5afc3158ebd7ad0b8a161229f8f576e7683e3c432d09793db071239e6344490f6e08d01c9061a32556b5bce6dcd68823b47a0cf

diff --git a/media-video/syncplay/syncplay-1.5.1.ebuild 
b/media-video/syncplay/syncplay-1.5.1.ebuild
new file mode 100644
index 000..00a24344bbf
--- /dev/null
+++ b/media-video/syncplay/syncplay-1.5.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Client/server to synchronize media playback"
+HOMEPAGE="http://syncplay.pl;
+SRC_URI="https://github.com/Syncplay/syncplay/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="+client +server gui vlc"
+REQUIRED_USE="vlc? ( client )
+   gui? ( client )
+   ${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+# TODO: investigate the possibility of enabling PyQt5 gui
+# possible licensing concerns
+RDEPEND="${PYTHON_DEPS}
+   || (
+   >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+   dev-python/twisted-core[${PYTHON_USEDEP}]
+   )
+   gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
+   vlc? ( media-video/vlc[lua] )"
+
+src_prepare() {
+   default
+   if ! use gui; then
+   sed -i 's/"noGui": False,/"noGui": True,/' \
+   syncplay/ui/ConfigurationGetter.py \
+   || die "Failed to patch ConfigurationGetter.py"
+   fi
+}
+
+src_compile() {
+   :
+}
+
+src_install() {
+   local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
+   use client && \
+   emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) 
install-client
+   use server && \
+   emake "${MY_MAKEOPTS[@]}" install-server
+}
+
+pkg_postinst() {
+   if use client; then
+   einfo "Syncplay supports the following players:"
+   einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
+   fi
+}

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

[Patrice Clement]

commit: 119450849c0f5e79ee24b5e117f71ea7095e62ec
Author: Mykyta Holubakha  gmail  com>
AuthorDate: Thu Jan 25 22:11:59 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jan 30 22:19:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11945084

media-video/syncplay: drop old 1.4.0.

 media-video/syncplay/Manifest  |  1 -
 media-video/syncplay/syncplay-1.4.0.ebuild | 61 --
 2 files changed, 62 deletions(-)

diff --git a/media-video/syncplay/Manifest b/media-video/syncplay/Manifest
index 4bbe1ba2982..793278dbb8b 100644
--- a/media-video/syncplay/Manifest
+++ b/media-video/syncplay/Manifest
@@ -1,3 +1,2 @@
-DIST syncplay-1.4.0.tar.gz 539743 BLAKE2B 
52eeb80480783c827538aa9c7bde1bf9516ae1219600e6be42eb8e0477c2b6377e6b2d0e950bd83367cca55d8aad47bb756d820b795d3354465e3e4989aec1ea
 SHA512 
2266ffafe3b15730a43e3ddd8aa24e99c65ce5a4e95d05bcac745262d310cb846c84c6e5bb061ebb96e89faa0f10e22aacee286db6cbe53cd5f521cb2e5eee1a
 DIST syncplay-1.5.0.tar.gz 1588514 BLAKE2B 
0f2bddf3500758c3081bdba993b21fe60a0d3af7081c5edd0f684e1d60a2a95edce133a597e79747350e681dd40768226226f0b26e295850a8c218107b1da3e9
 SHA512 
8a57add8a845c041c02147415fc4b7941a41edfb80fc037c3af4e246d9ca6391be9f3886407470b1b51b8783ad6306e42bb34991e7cbb08eea87e781e3cd2200
 DIST syncplay-1.5.1.tar.gz 1603524 BLAKE2B 
0d7edb0c2129f67ce457cffb57f5600d0c0d6bee017119efc866d748f63e6e984becd21f88324e19dcac3f0ce52e2e2f1bf65326aab6237ea41b04bdecf26334
 SHA512 
8d7f99132b49148003dcdc83b5afc3158ebd7ad0b8a161229f8f576e7683e3c432d09793db071239e6344490f6e08d01c9061a32556b5bce6dcd68823b47a0cf

diff --git a/media-video/syncplay/syncplay-1.4.0.ebuild 
b/media-video/syncplay/syncplay-1.4.0.ebuild
deleted file mode 100644
index f1762037dbc..000
--- a/media-video/syncplay/syncplay-1.4.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PV=${PV/_rc/-RC}
-
-DESCRIPTION="Client/server to synchronize media playback"
-HOMEPAGE="http://syncplay.pl;
-SRC_URI="https://github.com/Syncplay/syncplay/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+client +server gui vlc"
-REQUIRED_USE="vlc? ( client )
-   gui? ( client )
-   ${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-   || (
-   >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
-   dev-python/twisted-core[${PYTHON_USEDEP}]
-   )
-   gui? ( dev-python/pyside[${PYTHON_USEDEP}] )
-   vlc? ( media-video/vlc[lua] )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-   default
-   if ! use gui; then
-   sed -i 's/"noGui": False,/"noGui": True,/' \
-   syncplay/ui/ConfigurationGetter.py \
-   || die "Failed to patch ConfigurationGetter.py"
-   fi
-}
-
-src_compile() {
-   :
-}
-
-src_install() {
-   local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
-   use client && \
-   emake "${MY_MAKEOPTS[@]}" VLC_SUPPORT=$(usex vlc true false) 
install-client
-   use server && \
-   emake "${MY_MAKEOPTS[@]}" install-server
-}
-
-pkg_postinst() {
-   if use client; then
-   einfo "Syncplay supports the following players:"
-   einfo "media-video/mpv, media-video/mplayer2, media-video/vlc"
-   fi
-}

[gentoo-commits] proj/portage:master commit in: man/, pym/portage/, bin/install-qa-check.d/

[Michał Górny]

commit: 104635efa9b4c9e268832d9ac64ad39e44002df3
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 10 16:40:08 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 22:12:21 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=104635ef

install-qa-check: New QA check/cleanup for empty directories

Warn about empty directories installed to /var in install-qa-check phase
(that were not "filled" using keepdir), to help developers stop relying
upon Portage preserving them. Those directories are rather unlikely to
be false positives.

Furthermore, remove all the empty directories if FEATURES=strict-keepdir
is used to catch even more problems (intended for developers). Here
warnings are not really suitable since there will be a high number
of false positives.

The PMS specifies the behavior upon merging empty directories
as undefined, and specifically prohibits ebuilds from attempting
to install empty directories. However, ebuilds occasionally still fall
into the trap of relying on 'dodir' preserving the directory. Make
the Portage behavior more strict in order to prevent that.

Reviewed-by: Zac Medico  gentoo.org>

 bin/install-qa-check.d/95empty-dirs | 42 +
 man/make.conf.5 |  4 
 pym/portage/const.py|  1 +
 3 files changed, 47 insertions(+)

diff --git a/bin/install-qa-check.d/95empty-dirs 
b/bin/install-qa-check.d/95empty-dirs
new file mode 100644
index 0..8599db395
--- /dev/null
+++ b/bin/install-qa-check.d/95empty-dirs
@@ -0,0 +1,42 @@
+# Warn about and/or remove empty directories installed by ebuild.
+
+# Rationale: PMS prohibits ebuilds from installing empty directories.
+# Cleaning them up from the installation image provides an easy way
+# to make sure that ebuilds are not relying on it while making it easy
+# for users to override this if they need to.
+#
+# The ebuilds that need to preserve empty directories should use keepdir
+# as documented e.g.:
+# https://devmanual.gentoo.org/function-reference/install-functions/index.html
+#
+# For now, we emit QA warnings for empty directories in /var.
+# Additionally, if FEATURES=strict-keepdir is enabled we explicitly
+# remove *all* empty directories to trigger breakage.
+
+find_empty_dirs() {
+   local warn_dirs=()
+   local d striparg=
+
+   [[ ${FEATURES} == *strict-keepdir* ]] && striparg=-delete
+
+   while IFS= read -r -d $'\0' d; do
+   [[ ${d} == ${ED%/}/var/* ]] && warn_dirs+=( "${d}" )
+   done < <(find "${ED}" -depth -mindepth 1 -type d -empty -print0 
${striparg} | LC_COLLATE=C sort -z)
+
+   if [[ ${warn_dirs[@]} ]]; then
+   eqawarn "One or more empty directories installed to /var:"
+   eqawarn
+   for d in "${warn_dirs[@]}"; do
+   eqawarn "  ${d#${ED%/}}"
+   done
+   eqawarn
+   eqawarn "If those directories need to be preserved, please make 
sure to create"
+   eqawarn "or mark them for keeping using 'keepdir'. Future 
versions of Portage"
+   eqawarn "will strip empty directories from installation image."
+   fi
+}
+
+find_empty_dirs
+: # guarantee successful exit
+
+# vim:ft=sh

diff --git a/man/make.conf.5 b/man/make.conf.5
index a81b497bd..cb0f00237 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -623,6 +623,10 @@ see \fBinstallsources\fR.
 Have portage react strongly to conditions that have the potential to be
 dangerous (like missing or incorrect digests for ebuilds).
 .TP
+.B strict-keepdir
+Have portage strictly require keepdir calls in ebuilds.  Empty
+directories installed without explicit keepdir will be removed.
+.TP
 .B stricter
 Have portage react strongly to conditions that may conflict with system
 security provisions (for example textrels, executable stack).  Read about

diff --git a/pym/portage/const.py b/pym/portage/const.py
index e5fa4b67c..655be82b1 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -184,6 +184,7 @@ SUPPORTED_FEATURES   = frozenset([
"split-elog",
"split-log",
"strict",
+   "strict-keepdir",
"stricter",
"suidctl",
"test",

[gentoo-commits] proj/musl:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Aric Belsito]

commit: a8cfa5cc19b6f475e4fd2a3b4484eb9d7fc78994
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 21:41:13 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 21:41:13 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=a8cfa5cc

dev-libs/libbsd: add patch

there's definitely a way to do this that doesn't break glibc
compatibility

 dev-libs/libbsd/files/libbsd-0.8.7-musl.patch | 26 ++
 dev-libs/libbsd/libbsd-0.8.7.ebuild   |  1 +
 2 files changed, 27 insertions(+)

diff --git a/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch 
b/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
new file mode 100644
index 000..b541ff4
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.8.7-musl.patch
@@ -0,0 +1,26 @@
+diff -Naur libbsd-0.8.7.orig/include/bsd/stdlib.h 
libbsd-0.8.7/include/bsd/stdlib.h
+--- libbsd-0.8.7.orig/include/bsd/stdlib.h 2018-01-30 13:28:46.240353330 
-0800
 libbsd-0.8.7/include/bsd/stdlib.h  2018-01-30 13:39:33.539341738 -0800
+@@ -67,9 +67,7 @@
+const unsigned char *table, unsigned endbyte);
+ 
+ void *reallocf(void *ptr, size_t size);
+-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
+ void *reallocarray(void *ptr, size_t nmemb, size_t size);
+-#endif
+ 
+ long long strtonum(const char *nptr, long long minval, long long maxval,
+const char **errstr);
+diff -Naur libbsd-0.8.7.orig/include/bsd/string.h 
libbsd-0.8.7/include/bsd/string.h
+--- libbsd-0.8.7.orig/include/bsd/string.h 2018-01-30 13:28:46.239353330 
-0800
 libbsd-0.8.7/include/bsd/string.h  2018-01-30 13:39:27.108341853 -0800
+@@ -42,9 +42,7 @@
+ char *strnstr(const char *str, const char *find, size_t str_len);
+ void strmode(mode_t mode, char *str);
+ 
+-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
+ void explicit_bzero(void *buf, size_t len);
+-#endif
+ __END_DECLS
+ 
+ #endif

diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild 
b/dev-libs/libbsd/libbsd-0.8.7.ebuild
index 338666f..938d433 100644
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
@@ -18,6 +18,7 @@ RDEPEND=""
 
 src_prepare() {
eapply "${FILESDIR}"/${PN}-0.8.5-cdef-headers.patch
+   eapply "${FILESDIR}"/${PN}-0.8.7-musl.patch
default
 }
 

[gentoo-commits] repo/gentoo:master commit in: app-misc/ddcutil/, app-misc/ddcutil/files/

[Jonathan Scruggs]

commit: 1c133a7cccdf1f1aff10ec0a00766cb073d72f8b
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Tue Jan 30 21:07:42 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 21:27:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c133a7c

app-misc/ddcutil: remove pedantic compiler flag

Closes: https://bugs.gentoo.org/645830
Closes: https://github.com/gentoo/gentoo/pull/7003

 app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild   | 108 ++
 .../ddcutil-0.8.6-remove-pedantic-cflag.patch  | 126 +
 2 files changed, 234 insertions(+)

diff --git a/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild 
b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
new file mode 100644
index 000..a1402f71b64
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/;
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+   sys-apps/i2c-tools
+   virtual/udev
+   drm? ( x11-libs/libdrm )
+   usb-monitor? (
+   dev-libs/hidapi
+   virtual/libusb:1
+   sys-apps/usbutils
+   )
+   X? (
+   x11-libs/libXrandr
+   x11-libs/libX11
+   )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-remove-pedantic-cflag.patch )
+
+pkg_pretend() {
+   # This program needs /dev/ic2-* devices to communicate with the monitor.
+   CONFIG_CHECK="~I2C_CHARDEV"
+   ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to 
continue"
+   if use usb-monitor; then
+   CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+   ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+   ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+   fi
+
+   # Now do the actual checks setup above
+   check_extra_config
+}
+
+src_prepare() {
+   default
+   eautoreconf
+}
+
+src_configure() {
+   # Bug 607818.
+   replace-flags -O3 -O2
+
+   local myeconfargs=(
+   $(use_enable drm)
+   $(use_enable usb-monitor usb)
+   $(use_enable X x11)
+   --enable-lib
+   --disable-cffi
+   --disable-cython
+   --disable-swig
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   default
+   if use user-permissions; then
+   udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+   if use usb-monitor; then
+   udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+   fi
+   fi
+}
+
+pkg_postinst() {
+   if use user-permissions; then
+   enewgroup i2c
+   einfo "To allow non-root users access to the /dev/i2c-* 
devices, add those"
+   einfo "users to the i2c group: usermod -aG i2c user"
+   einfo "Restart the computer or reload the i2c-dev module to 
activate"
+   einfo "the new udev rule."
+   einfo "For more information read: 
http://www.ddcutil.com/i2c_permissions/;
+
+   if use usb-monitor; then
+   enewgroup video
+   einfo "To allow non-root users access to USB monitors, 
add those users"
+   einfo "to the video group: usermod -aG video user"
+   einfo "Restart the computer, reload the hiddev and 
hidraw modules, or replug"
+   einfo "the monitor to activate the new udev rule."
+   einfo "For more information read: 
http://www.ddcutil.com/usb/;
+   fi
+
+   udev_reload
+   fi
+
+   if use video_cards_nvidia; then
+   ewarn "Please read the following webpage on proper usage with 
the nVidia "
+   ewarn "binary drivers, or it may not work: 
http://www.ddcutil.com/nvidia/;
+   fi
+}

diff --git a/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch 
b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
new file mode 100644
index 000..e20cc36459e
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
@@ -0,0 +1,126 @@
+diff -urN a/src/app_sysenv/Makefile.am b/src/app_sysenv/Makefile.am
+--- a/src/app_sysenv/Makefile.am   2018-01-20 06:40:55.0 +
 b/src/app_sysenv/Makefile.am   2018-01-28 20:16:44.143484825 +
+@@ -15,8 +15,8 @@
+ 
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror

[gentoo-commits] proj/musl:master commit in: sys-kernel/linux-headers/

[Aric Belsito]

commit: c2d5c2ba9527e8986b75183e22679909e7eacef3
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 21:22:38 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 21:22:38 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=c2d5c2ba

sys-kernel/linux-headers: fix manifest

 sys-kernel/linux-headers/Manifest | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys-kernel/linux-headers/Manifest 
b/sys-kernel/linux-headers/Manifest
index da2e9ce..26bc427 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,6 @@
-DIST gentoo-headers-4.13-1.tar.xz 4096 SHA256 
51c7559ac940739e62973e1c1de1ce0b3cf3af5c6bbfefb933b073cdf70fb74f SHA512 
14236185c8810b88d94ff0533fe59e84599c2d4e5c7507c37cb458b6728eed69b581df7f8654d5323454ec359e93490c4dcbbb1ee58a66f2586047c93f0f1aa6
 WHIRLPOOL 
6813e263830efccdb6dc6f396de766f0e9a50f05ea3b782d6859bdef6d0bb46cd58dce73394c1da94e596d39e72c64065fde515ae0f2576835659a44a2d969d5
+DIST gentoo-headers-4.13-1.tar.xz 4096 BLAKE2B 
a0506c6aec14d8d710863cc3f7b5ce6cc067af245cc96dbf83f10f02ba83d580f900c9cf8b09b496370d580a9b9cd935738d8b4b0cb987836490894fba01cf23
 SHA512 
14236185c8810b88d94ff0533fe59e84599c2d4e5c7507c37cb458b6728eed69b581df7f8654d5323454ec359e93490c4dcbbb1ee58a66f2586047c93f0f1aa6
 DIST gentoo-headers-4.14-1.tar.xz 4080 BLAKE2B 
5d8bb4453d3b0b739922a86e0e45120fe5ad57c3310ff6a94830a3a7561fb3b5eef7805ff171bdf0d5582fc91848fad948162e63ec4922280c8ed68ba58d50e1
 SHA512 
e0f806db641c99f3f71e27fde29705685745c9c03b901c943cab5af84e2e9c3af96f5d2d10d8f5328ec7e4dba28b378f534317bf1bee597d429557b981f0a865
-DIST gentoo-headers-base-4.13.tar.xz 7951980 SHA256 
1182441e77bdf23f4738d4d70adda5b65d6d3550d50e2c21f44a11d26468a474 SHA512 
3b528e18199d43db3f51c8fb9a5a4c67b9317ea7e9b9fd82fe2cb4d704bbc1253f2af64dc79377ee8ec26511d0893409e3dddbb9a6ae11e8bb7f4ca4d8d3ac9a
 WHIRLPOOL 
08089853ff9f5aa0090f1c14852c822e7046649b786f6f1e6130be131e18de79bf90d0678f39f608c770460e5c6624ba88e680b363b7edb5f613ab5a7a6396c1
+DIST gentoo-headers-4.15-1.tar.xz 4068 BLAKE2B 
fc99b99637a11dc0cc6b4d79be3e32242f4b4f3c86a4618b3a51839e902ebad045b335f531ca41c10a6a597111f2cf77a0ae17518fb17a8441b26f1bd98c19e7
 SHA512 
cb973625381ac0115344d9aa1ddd927d75f0c11961526844a9da6a0aebcd28b488a7af3b423ac8358808d998d9d00d51156780905a04c01c6c512215cad6de7d
+DIST gentoo-headers-base-4.13.tar.xz 7951980 BLAKE2B 
8b3b5d9152455b08bf06c275a69168f8a2418584058e23f784d3ab956d72b100b89d398bfeb351d8faa8285cd9ae8942726099ce9aa3fd94b8e0e92b8de1c217
 SHA512 
3b528e18199d43db3f51c8fb9a5a4c67b9317ea7e9b9fd82fe2cb4d704bbc1253f2af64dc79377ee8ec26511d0893409e3dddbb9a6ae11e8bb7f4ca4d8d3ac9a
 DIST gentoo-headers-base-4.14.tar.xz 8017944 BLAKE2B 
e967a3f26fa002f62af72c165cf960e855f5d84dd105b3f136e5ae24f4cdfc9e5f8b217a83955b325ca4bd6bda0a9d4c4de02d8d79fd4aa72191bc63db96183a
 SHA512 
2a4e83a9ee36ffa85b59ebac1e12f4f1c572825b767928a42c4748d924d04f0536bab4d9375ca68c11ad867c226f386c40c7c4d0158d1ab00c838eb5b2f9f21a
+DIST gentoo-headers-base-4.15.tar.xz 8199628 BLAKE2B 
79a4f694a8335ed4bf1df94ab7829f41d3476165d0ce822a13e47461d7e3ee4cdb5e88acb9960a92ba1142adeb9951c19e17405c37b80d461b8577c7d1dfa37a
 SHA512 
7698ae90e356cb6105d3b1fc5351264774428b5caa405e8695925965ab2ff3a08c0dfe3587a69a87405ecc45c6cd3040c3a9f751d6e6dc8eddf8b28ded4e2584

[gentoo-commits] proj/musl:master commit in: dev-libs/libbsd/

[Aric Belsito]

commit: 9be24f8b817ccbaa50ffa9498b1191d8091063b7
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 21:21:22 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 21:21:22 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9be24f8b

dev-libs/libbsd: version bump to 0.8.7

 dev-libs/libbsd/Manifest|  1 +
 dev-libs/libbsd/libbsd-0.8.7.ebuild | 45 +
 2 files changed, 46 insertions(+)

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 2b971ba..bef4627 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1 +1,2 @@
 DIST libbsd-0.8.6.tar.xz 371112 SHA256 
467fbf9df1f49af11f7f686691057c8c0a7613ae5a870577bef9155de39f9687 SHA512 
ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
 WHIRLPOOL 
e4f9b84fb9c0953fd1732725b481d04e69b03ceeb35ec708bd4ecf549e01c3787323d18d7d0058c293ea31e6d135e734c73345c5af1dabed36a9551bdf5e3dc5
+DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B 
aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc50a4fda09c540b058
 SHA512 
605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3

diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild 
b/dev-libs/libbsd/libbsd-0.8.7.ebuild
new file mode 100644
index 000..338666f
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="An library to provide useful functions commonly found on BSD 
systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/;
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz;
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="static-libs"
+
+DEPEND=">=sys-kernel/linux-headers-3.17"
+RDEPEND=""
+
+src_prepare() {
+   eapply "${FILESDIR}"/${PN}-0.8.5-cdef-headers.patch
+   default
+}
+
+pkg_setup() {
+   local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
+   local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc 
first."
+   if ! has_version ${CATEGORY}/${PN}; then
+   if [[ -e ${f} ]]; then
+   eerror "${m}"
+   die "${m}"
+   fi
+   fi
+}
+
+multilib_src_configure() {
+   # The build system will install libbsd-ctor.a despite of 
USE="-static-libs"
+   # which is correct, see:
+   # 
https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
+   ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+   emake DESTDIR="${D}" install
+   find "${ED}" -name "*.la" -delete || die
+}

[gentoo-commits] proj/musl:master commit in: sys-kernel/linux-headers/files/, sys-kernel/linux-headers/

[Aric Belsito]

commit: 9140a9596d82701700e82bfee718161a2a93599f
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 21:16:43 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 21:16:43 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=9140a959

sys-kernel/linux-headers: version bump to 4.15

 .../files/libc-4.15-portability.patch  | 165 +
 sys-kernel/linux-headers/linux-headers-4.15.ebuild |  58 
 2 files changed, 223 insertions(+)

diff --git a/sys-kernel/linux-headers/files/libc-4.15-portability.patch 
b/sys-kernel/linux-headers/files/libc-4.15-portability.patch
new file mode 100644
index 000..09af412
--- /dev/null
+++ b/sys-kernel/linux-headers/files/libc-4.15-portability.patch
@@ -0,0 +1,165 @@
+diff -Naur gentoo-headers-base-4.15.orig/include/uapi/linux/kernel.h 
gentoo-headers-base-4.15/include/uapi/linux/kernel.h
+--- gentoo-headers-base-4.15.orig/include/uapi/linux/kernel.h  2018-01-29 
21:22:19.0 -0800
 gentoo-headers-base-4.15/include/uapi/linux/kernel.h   2018-01-30 
13:05:03.399378810 -0800
+@@ -2,7 +2,9 @@
+ #ifndef _UAPI_LINUX_KERNEL_H
+ #define _UAPI_LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include 
++#endif
+ 
+ /*
+  * 'kernel.h' contains some often-used function prototypes etc
+diff -Naur gentoo-headers-base-4.15.orig/include/uapi/linux/libc-compat.h 
gentoo-headers-base-4.15/include/uapi/linux/libc-compat.h
+--- gentoo-headers-base-4.15.orig/include/uapi/linux/libc-compat.h 
2018-01-29 21:22:19.0 -0800
 gentoo-headers-base-4.15/include/uapi/linux/libc-compat.h  2018-01-30 
13:14:11.470368995 -0800
+@@ -49,47 +49,57 @@
+ #ifndef _UAPI_LIBC_COMPAT_H
+ #define _UAPI_LIBC_COMPAT_H
+ 
+-/* We have included glibc headers... */
+-#if defined(__GLIBC__)
++/* We're used from userspace... */
++#if !defined(__KERNEL__)
+ 
+-/* Coordinate with glibc net/if.h header. */
++/* Coordinate with libc net/if.h header. */
+ #if defined(_NET_IF_H) && defined(__USE_MISC)
+ 
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+  * that would already be defined. */
+ 
+ #define __UAPI_DEF_IF_IFCONF 0
+ #define __UAPI_DEF_IF_IFMAP 0
+ #define __UAPI_DEF_IF_IFNAMSIZ 0
+ #define __UAPI_DEF_IF_IFREQ 0
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
+-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++#if !defined(__GLIBC__)
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
++#else
+ #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
++#endif /* !defined(__GLIBC__) */
+ 
+ #else /* _NET_IF_H */
+ 
+ /* Linux headers included first, and we must define everything
+- * we need. The expectation is that glibc will check the
++ * we need. The expectation is that libc will check the
+  * __UAPI_DEF_* defines and adjust appropriately. */
+ 
+ #define __UAPI_DEF_IF_IFCONF 1
+ #define __UAPI_DEF_IF_IFMAP 1
+ #define __UAPI_DEF_IF_IFNAMSIZ 1
+ #define __UAPI_DEF_IF_IFREQ 1
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+ 
+ #endif /* _NET_IF_H */
+ 
+-/* Coordinate with glibc netinet/in.h header. */
++/* Coordinate with libc netinet/if_ether.h */
++#ifdef _NETINET_IF_ETHER_H
++#define __UAPI_DEF_ETHHDR 0
++#else
++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */
++#define __UAPI_DEF_ETHHDR 1
++#endif /* _NETINET_IF_ETHER_H */
++
++/* Coordinate with libc netinet/in.h header. */
+ #if defined(_NETINET_IN_H)
+ 
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+  * that would already be defined. */
+ #define __UAPI_DEF_IN_ADDR0
+ #define __UAPI_DEF_IN_IPPROTO 0
+@@ -99,15 +109,7 @@
+ #define __UAPI_DEF_IN_CLASS   0
+ 
+ #define __UAPI_DEF_IN6_ADDR   0
+-/* The exception is the in6_addr macros which must be defined
+- * if the glibc code didn't define them. This guard matches
+- * the guard in glibc/inet/netinet/in.h which defines the
+- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
+-#if defined(__USE_MISC) || defined (__USE_GNU)
+ #define __UAPI_DEF_IN6_ADDR_ALT   0
+-#else
+-#define __UAPI_DEF_IN6_ADDR_ALT   1
+-#endif
+ #define __UAPI_DEF_SOCKADDR_IN6   0
+ #define __UAPI_DEF_IPV6_MREQ  0
+ #define __UAPI_DEF_IPPROTO_V6 0
+@@ -118,7 +120,7 @@
+ #else
+ 
+ /* Linux headers included first, and we 

[gentoo-commits] proj/musl:master commit in: sys-devel/gdb/

[Aric Belsito]

commit: d7f669fe87e834e1e0583868a21b5031123f2899
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 21:03:26 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 21:03:26 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=d7f669fe

sys-devel/gdb: version bump to 8.0.1-r1

 sys-devel/gdb/Manifest  |  9 +
 sys-devel/gdb/{gdb-8.0.1.ebuild => gdb-8.0.1-r1.ebuild} | 12 
 sys-devel/gdb/gdb-8.0.1.ebuild  |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 9543e63..de0f4f2 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,4 +1,5 @@
-DIST gdb-7.10.1.tar.xz 18531436 SHA256 
25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5 SHA512 
17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
 WHIRLPOOL 
02936f59d3f3f8a57966c72402f1da128dd8e10e686097ffdb3a2741cc0c1831ef27f97daa047fa006ff2ae9f79ae0480f6f0dc2d3f5904190a1dade0590c837
-DIST gdb-7.12.1.tar.xz 19225392 SHA256 
4607680b973d3ec92c30ad029f1b7dbde3876869e6b3a117d8a7e90081113186 SHA512 
0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8
 WHIRLPOOL 
1da1d9680639531000f2518fb6e01551f7d35091065b933a25381339f7d78d64486b7ce54dd9815f7e82884133ccd6868950a15c27fb5a7b9b13243e99eba697
-DIST gdb-8.0.1.tar.xz 19583920 SHA256 
3dbd5f93e36ba2815ad0efab030dcd0c7b211d7b353a40a53f4c02d7d56295e3 SHA512 
5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1
 WHIRLPOOL 
4632580658f85faab596b98f4f9b3b21a48fc067f56c9ac987e4895f3bd1b430d8f78ef95965e0b78c53e69b502acdeeff5e966c3e8021e6426ce86b78807c17
-DIST gdb-8.0.tar.xz 19588616 SHA256 
f6a24ffe4917e67014ef9273eb8b547cb96a13e5ca74895b06d683b391f3f4ee SHA512 
e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886
 WHIRLPOOL 
8e5f49fd8d6a57778ba80cab8768fc11426720c15d54010f9fbcac2c6d8495e7d17ea133f9006d650ed34fdb95b82ac1942d935eaa6b7218fc51d6de6e2213bb
+DIST gdb-7.10.1.tar.xz 18531436 BLAKE2B 
b50a1b6b5b867e4a52943fdc4992c654ceec180099771381df78de5ba79086e822264356a762c61b89e986407d6f0cce336be216276545591e637131dc02f4a8
 SHA512 
17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010
+DIST gdb-7.12.1.tar.xz 19225392 BLAKE2B 
2e4b7fe69c3cb11c04b505d1e110bf0a9ca65b6178f3e6a6ccc11fde1e8750b595016baf64adb2c22903d346cec1dab15574681de812ac8d260aebf4152a3027
 SHA512 
0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8
+DIST gdb-8.0.1-patches-1.tar.xz 8620 BLAKE2B 
8595017a881c41cbe78846fae9f50460aa6a4aa8d3863b17e4b9119d886600ee086b642c44b427a2de29c5f3fd4697df838e85e23aafeac05a6ce3291546f099
 SHA512 
912ad1a51207ca1ec9d3c46e32b07d78a5d3368b617f277532f8a81e40875cc9ec5af8b62f9b1de67aa6d09520c6cc6ad32f48bd44415985d8ad03aa4a1bca7d
+DIST gdb-8.0.1.tar.xz 19583920 BLAKE2B 
c22e314a0fe3ccb84cef6eca66c51af60914160ac9760cbe517628079dfb15ec73a623badf070b3162d4bd9e44937f717fd44e1d569edba4532853c82b31ac1d
 SHA512 
5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1
+DIST gdb-8.0.tar.xz 19588616 BLAKE2B 
148965e33a42787b5fa39650c2b6c48e28895930e36f11b44e8391366be1cc3bd4265ea7df932a7d650291fb20e3f66956c7dff1923025f889e5c035d3bf4207
 SHA512 
e4044bdd162cbf95044ec1eaa44d2fa62a33e051bdbbacbc97afd4dfb07bae1bea514381fc1966aede89d6796ef2377a15748a93d95e2ad494c8497db489e886

diff --git a/sys-devel/gdb/gdb-8.0.1.ebuild b/sys-devel/gdb/gdb-8.0.1-r1.ebuild
similarity index 95%
copy from sys-devel/gdb/gdb-8.0.1.ebuild
copy to sys-devel/gdb/gdb-8.0.1-r1.ebuild
index 34d049c..aedaaa2 100644
--- a/sys-devel/gdb/gdb-8.0.1.ebuild
+++ b/sys-devel/gdb/gdb-8.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,10 +48,14 @@ case ${PV} in
;;
 esac
 
-PATCH_VER=""
+PATCH_VER="1"
+PATCH_DEV="slyfox"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="https://sourceware.org/gdb/;
-SRC_URI="${SRC_URI} 
${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+SRC_URI="${SRC_URI}
+   
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
+   ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -202,7 +206,7 @@ src_install() {
 
# Don't install docs when building a cross-gdb
if [[ ${CTARGET} != ${CHOST} ]] ; then
-   rm -r "${ED}"/usr/share/{doc,info,locale} || die

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

[Jonathan Scruggs]

commit: 4947589313e37504f472f4d5414b4f0d4d3e7af0
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Jan 29 15:16:35 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 21:01:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49475893

media-libs/osl: add 1.9.6 release

Closes: https://github.com/gentoo/gentoo/pull/6996

 media-libs/osl/Manifest |  1 +
 media-libs/osl/metadata.xml |  6 
 media-libs/osl/osl-1.9.6.ebuild | 69 +
 3 files changed, 76 insertions(+)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index b3d37043f05..ace6b6de3cf 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1 +1,2 @@
 DIST osl-1.8.12.tar.gz 14572814 BLAKE2B 
edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b
 SHA512 
29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
+DIST osl-1.9.6.tar.gz 14765052 BLAKE2B 
c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06c9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002
 SHA512 
e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961

diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index c5955714443..b20cc885573 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -19,6 +19,12 @@
lights, displacement, and pattern generation.


+   
+   SIMD Optimization
+   
+   
+   SIMD Optimization
+   
Use media-libs/partio



diff --git a/media-libs/osl/osl-1.9.6.ebuild b/media-libs/osl/osl-1.9.6.ebuild
new file mode 100644
index 000..17accb5fe95
--- /dev/null
+++ b/media-libs/osl/osl-1.9.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl;
+
+MY_PV=${PV//_} # Remove underscore if any.
+[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
+
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+   sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+   avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND=">=media-libs/openexr-2.2.0
+   >=media-libs/openimageio-1.8.0
+   dev-libs/pugixml
+   sys-libs/zlib:=
+   partio? ( media-libs/partio )"
+
+DEPEND="${RDEPEND}
+   >=dev-libs/boost-1.62
+   sys-devel/clang
+   sys-devel/bison
+   sys-devel/flex
+   virtual/pkgconfig"
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
+
+src_configure() {
+   local cpufeature
+   local mysimd=()
+   for cpufeature in "${CPU_FEATURES[@]}"; do
+   use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+   done
+
+   # If no CPU SIMDs were used, completely disable them
+   [[ -z ${mysimd} ]] && mysimd=("0")
+
+   # LLVM needs CPP11. Do not disable.
+   local mycmakeargs=(
+   -DLLVM_STATIC=ON
+   -DUSE_EXTERNAL_PUGIXML=ON
+   -DUSE_PARTIO=$(usex partio)
+   -DENABLERTTI=OFF
+   -DSTOP_ON_WARNING=OFF
+   -DOSL_BUILD_TESTS=$(usex test)
+   -DINSTALL_DOCS=$(usex doc)
+   -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+   -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+   )
+
+   cmake-utils_src_configure
+}

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

[Jonathan Scruggs]

commit: 65833f7dc77f342cfbd705d2548cc76f32de2d8e
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Jan 29 15:26:52 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 20:59:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65833f7d

media-libs/opencollada: add 1.6.2 release

Closes: https://github.com/gentoo/gentoo/pull/6997

 media-libs/opencollada/Manifest|   1 +
 .../files/opencollada-1.6.62-cmake-fixes.patch | 122 +
 media-libs/opencollada/opencollada-1.6.62.ebuild   |  65 +++
 3 files changed, 188 insertions(+)

diff --git a/media-libs/opencollada/Manifest b/media-libs/opencollada/Manifest
index d1542aa0bf5..536be7f94eb 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -2,3 +2,4 @@ DIST opencollada-1.6.25.tar.gz 11817949 BLAKE2B 
84278ae25d64ab827806c6ec588a333a
 DIST opencollada-1.6.31.tar.gz 11832790 BLAKE2B 
297130a8f844f4f80f4394db85098eaeaf42da125f34f20b4b6285c2bd0afc20c7066e3c54f73012c188b5b3c79f43be351fdc3b612b1e5c67ecc0ae19acb0f3
 SHA512 
6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9
 DIST opencollada-1.6.36.tar.gz 12275972 BLAKE2B 
3f7afb81767e92d1f6efeaf114caf0fa426d075ccd0fcd9f5c8e3951d7706329c545643cab8d18c05542d26933f3e016f96ca9931554b2929d8f815661917529
 SHA512 
bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8
 DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B 
ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961
 SHA512 
122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
+DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 
6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5
 SHA512 
bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574

diff --git a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch 
b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
new file mode 100644
index 000..8fc32784daa
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
@@ -0,0 +1,122 @@
+From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs 
+Date: Sat, 13 Jan 2018 11:54:44 +
+Subject: [PATCH] OpenCOLLADA/CMakeLists.txt
+
+Use CMAKE_BUILD_TYPE which can be overrided with custom distro types
+
+Adhere to GNU filesystem layout conventions. Not all distros and OSes
+have directories in the same locations and they define the
+GNUInstallDirs variables, so use those variables. Also, this enables
+multi lib installations.
+
+Define the version variables to enable SONAME versioning on the
+library files in case there is ABI changes in the future.
+---
+ CMakeLists.txt | 58 --
+ 1 file changed, 36 insertions(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95abbe21..00ad8d6a 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -37,14 +37,41 @@ cmake_policy(SET CMP0010 NEW)
+ # Input directories must have CMakeLists.txt
+ cmake_policy(SET CMP0014 NEW)
+ 
+-# avoid having empty buildtype
+-set(CMAKE_BUILD_TYPE_INIT "Release")
+ 
+-set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Only do Release 
and Debug" FORCE )
+-mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
++# Set Release type for builds where CMAKE_BUILD_TYPE is unset
++# This is usually a good default as this implictly enables
++#
++#   CXXFLAGS = -O3 -DNDEBUG
++#
++if( NOT CMAKE_BUILD_TYPE )
++  set( CMAKE_BUILD_TYPE "Release" )
++endif()
+ 
+ SET(CMAKE_DEBUG_POSTFIX ""  CACHE STRING "Add this string to as suffix to 
Debug libraries, e.g.: xml2_d.lib " )
+ 
++# Adhere to GNU filesystem layout conventions
++include( GNUInstallDirs )
++
++
++# 
#-
++# Initialize project.
++
++project(OPENCOLLADA)  # must be after setting cmake_configuration_types
++
++set(EXTERNAL_LIBRARIES   ${OPENCOLLADA_SOURCE_DIR}/Externals) 
 # external libraries
++set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
++
++set(OPENCOLLADA_VERSION_MAJOR 1)
++set(OPENCOLLADA_VERSION_MINOR 6)
++set(OPENCOLLADA_VERSION_PATCH 62)
++set(OPENCOLLADA_VERSION 
${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
++
++if(NOT SOVERSION)
++  set(SOVERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}
++  CACHE STRING "Set the SO version in the SO name of the output 
library")
++endif()
++
++
+ 

[gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/files/

[Aric Belsito]

commit: 00671126e1e24f23a49e13915ed6636a64f7087b
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 20:58:41 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 20:58:41 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=00671126

sys-apps/iproute2: fix patch

 sys-apps/iproute2/files/iproute2-4.15.0-musl.patch | 55 ++
 1 file changed, 55 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch 
b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
index bd15130..8c4a924 100644
--- a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
+++ b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
@@ -177,3 +177,58 @@ diff -Naur iproute2-4.15.0.orig/tc/f_flower.c 
iproute2-4.15.0/tc/f_flower.c
  #include 
  #include 
  #include 
+diff -Naur iproute2-4.15.0.orig/tc/m_mirred.c iproute2-4.15.0/tc/m_mirred.c
+--- iproute2-4.15.0.orig/tc/m_mirred.c 2018-01-30 12:22:46.377424243 -0800
 iproute2-4.15.0/tc/m_mirred.c  2018-01-30 12:57:12.620387241 -0800
+@@ -17,6 +17,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.15.0.orig/tc/tc_class.c iproute2-4.15.0/tc/tc_class.c
+--- iproute2-4.15.0.orig/tc/tc_class.c 2018-01-30 12:22:46.369424244 -0800
 iproute2-4.15.0/tc/tc_class.c  2018-01-30 12:54:53.420389734 -0800
+@@ -15,6 +15,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.15.0.orig/tc/tc_filter.c iproute2-4.15.0/tc/tc_filter.c
+--- iproute2-4.15.0.orig/tc/tc_filter.c2018-01-30 12:22:46.368424244 
-0800
 iproute2-4.15.0/tc/tc_filter.c 2018-01-30 12:56:02.186388502 -0800
+@@ -15,6 +15,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.15.0.orig/tc/tc_qdisc.c iproute2-4.15.0/tc/tc_qdisc.c
+--- iproute2-4.15.0.orig/tc/tc_qdisc.c 2018-01-30 12:22:46.368424244 -0800
 iproute2-4.15.0/tc/tc_qdisc.c  2018-01-30 12:53:37.801391088 -0800
+@@ -15,6 +15,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.15.0.orig/tc/tc_util.h iproute2-4.15.0/tc/tc_util.h
+--- iproute2-4.15.0.orig/tc/tc_util.h  2018-01-30 12:22:46.367424244 -0800
 iproute2-4.15.0/tc/tc_util.h   2018-01-30 12:51:24.463393476 -0800
+@@ -4,7 +4,6 @@
+ 
+ #define MAX_MSG 16384
+ #include 
+-#include 
+ 
+ #include 
+ #include 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/files/, app-emulation/free42/

[José María Alonso]

commit: 6c4db02e9046c1cbd63c306410431b38efb371aa
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Tue Jan 30 20:42:50 2018 +
Commit: José María Alonso  gentoo  org>
CommitDate: Tue Jan 30 20:42:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c4db02e

app-emulation/free42: Bumps version to 2.0.12

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/free42/Manifest  |  1 +
 .../files/free42-2.0.12-fix-build-intel-lib.patch  | 12 +
 .../free42/files/free42-2.0.12-fix-makefile.patch  | 58 ++
 app-emulation/free42/free42-2.0.12.ebuild  | 49 ++
 4 files changed, 120 insertions(+)

diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 5b013b2944a..c205bbc8887 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,2 +1,3 @@
 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B 
a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a
 SHA512 
4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
+DIST free42-nologo-2.0.12.tgz 7389088 BLAKE2B 
4f205439e7f642e266ec3f4b5032c9b48c2b726f5cce80a5a855b925ae7ff8cccbba1ce066f54af37b87f28a13f5c92e724d35ee71aa1439b3934b370662c3ca
 SHA512 
b04d5c104deda8cb15d0a77186c55ae6270568255f4a6ad62ede33e0a154c42f5dce53456d60f434df04f46a0bb824caf45e58ce7c75f5a69102a7952defc611
 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 
708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be
 SHA512 
078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d

diff --git a/app-emulation/free42/files/free42-2.0.12-fix-build-intel-lib.patch 
b/app-emulation/free42/files/free42-2.0.12-fix-build-intel-lib.patch
new file mode 100644
index 000..a321b1d714b
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.0.12-fix-build-intel-lib.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
+--- a/gtk/build-intel-lib.sh   2018-01-08 02:52:33.0 +0100
 b/gtk/build-intel-lib.sh   2018-01-13 19:43:23.709997784 +0100
+@@ -4,7 +4,7 @@
+ cd IntelRDFPMathLib20U1
+ patch -p0 <../intel-lib-linux.patch
+ cd LIBRARY
+-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
++make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 
UNCHANGED_BINARY_FLAGS=0
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d 
'\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo 
'0 };'; echo '#endif' ) > readtest_lines.cc

diff --git a/app-emulation/free42/files/free42-2.0.12-fix-makefile.patch 
b/app-emulation/free42/files/free42-2.0.12-fix-makefile.patch
new file mode 100644
index 000..7642316920f
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.0.12-fix-makefile.patch
@@ -0,0 +1,58 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile 2018-01-08 02:52:33.0 +0100
 b/gtk/Makefile 2018-01-13 19:40:49.059998446 +0100
+@@ -15,11 +15,11 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ 
###
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+-Wall \
+-Wno-parentheses \
+-Wno-write-strings \
+-   -g \
++   -Wno-error=narrowing \
+-I/usr/X11R6/include \
+$(shell pkg-config --cflags gtk+-2.0) \
+-DVERSION="\"$(shell cat ../VERSION)\"" \
+@@ -27,21 +27,25 @@
+-DDECIMAL_GLOBAL_ROUNDING=1 \
+-DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-   -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++   -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++   ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+-fno-exceptions \
+-fno-rtti \
+-   -D_WCHAR_T_DEFINED
++   -D_WCHAR_T_DEFINED \
++   ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++MYLDFLAGS = -L/usr/X11R6/lib
++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
+ 
+ ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
++MYLDFLAGS += -Wl,--hash-style=both
+ LIBS += -lpthread
+ endif
+ 
++MYLDFLAGS += ${LDFLAGS}
++
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+   shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
+   core_commands3.cc core_commands4.cc core_commands5.cc \
+@@ -83,7 +87,7 @@
+ endif
+ 
+ $(EXE): $(OBJS)
+-  $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
++  $(CXX) -o $(EXE) 

[gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

[Aric Belsito]

commit: 08ff23de6c431da7289377616e26015eafd254e7
Author: Aric Belsito  gmail  com>
AuthorDate: Tue Jan 30 20:37:39 2018 +
Commit: Aric Belsito  gmail  com>
CommitDate: Tue Jan 30 20:37:39 2018 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=08ff23de

sys-apps/iproute2: version bump to 4.15.0

 sys-apps/iproute2/Manifest |   3 +-
 sys-apps/iproute2/files/iproute2-4.15.0-musl.patch | 179 +
 sys-apps/iproute2/iproute2-4.14.1-r2.ebuild|   2 +-
 ...te2-4.14.1-r3.ebuild => iproute2-4.15.0.ebuild} |   5 +-
 4 files changed, 184 insertions(+), 5 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ea284a2..0390df9 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1 +1,2 @@
-DIST iproute2-4.14.1.tar.xz 636876 SHA256 
d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 SHA512 
e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
 WHIRLPOOL 
42ee7611f3fb1ceb922c606bf11cd4d72cf71020a73f96f5130f07a9cab08f1dbc973cb5924f6a15cf4613dac5b60a3a97583c0e801db960f5039d6d8c0ef095
+DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 
232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41
 SHA512 
e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
+DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B 
e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b
 SHA512 
bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc

diff --git a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch 
b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
new file mode 100644
index 000..bd15130
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
@@ -0,0 +1,179 @@
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h 
iproute2-4.15.0/include/uapi/linux/if_tunnel.h
+--- iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h2018-01-30 
12:22:46.392424243 -0800
 iproute2-4.15.0/include/uapi/linux/if_tunnel.h 2018-01-30 
12:23:57.131422976 -0800
+@@ -3,7 +3,6 @@
+ #define _IF_TUNNEL_H_
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h 
iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h
+--- iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h   2018-01-30 
12:22:46.393424243 -0800
 iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h2018-01-30 
12:24:05.957422818 -0800
+@@ -3,7 +3,6 @@
+ #define _IP6_TUNNEL_H
+ 
+ #include 
+-#include  /* For IFNAMSIZ. */
+ #include /* For struct in6_addr. */
+ 
+ #define IPV6_TLV_TNL_ENCAP_LIMIT 4
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/kernel.h 
iproute2-4.15.0/include/uapi/linux/kernel.h
+--- iproute2-4.15.0.orig/include/uapi/linux/kernel.h   2018-01-30 
12:22:46.393424243 -0800
 iproute2-4.15.0/include/uapi/linux/kernel.h2018-01-30 
12:24:21.576422539 -0800
+@@ -2,7 +2,9 @@
+ #ifndef _LINUX_KERNEL_H
+ #define _LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include 
++#endif
+ 
+ /*
+  * 'kernel.h' contains some often-used function prototypes etc
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h 
iproute2-4.15.0/include/uapi/linux/libc-compat.h
+--- iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h  2018-01-30 
12:22:46.393424243 -0800
 iproute2-4.15.0/include/uapi/linux/libc-compat.h   2018-01-30 
12:33:58.575412206 -0800
+@@ -49,47 +49,57 @@
+ #ifndef _LIBC_COMPAT_H
+ #define _LIBC_COMPAT_H
+ 
+-/* We have included glibc headers... */
+-#if defined(__GLIBC__)
++/* We're used from userspace... */
++#if !defined(__KERNEL__)
+ 
+-/* Coordinate with glibc net/if.h header. */
++/* Coordinate with libc net/if.h header. */
+ #if defined(_NET_IF_H) && defined(__USE_MISC)
+ 
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+  * that would already be defined. */
+ 
+ #define __UAPI_DEF_IF_IFCONF 0
+ #define __UAPI_DEF_IF_IFMAP 0
+ #define __UAPI_DEF_IF_IFNAMSIZ 0
+ #define __UAPI_DEF_IF_IFREQ 0
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
++#if !defined(__GLIBC__)
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
++#else
+ /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
++#endif /* !defined(__GLIBC__) */
+ 
+ #else /* _NET_IF_H */
+ 
+ /* Linux headers 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/free42/, app-emulation/free42/files/

[José María Alonso]

commit: fca4bf16855ed8c1c72079662e9546f356f3b1f4
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Tue Jan 30 20:25:40 2018 +
Commit: José María Alonso  gentoo  org>
CommitDate: Tue Jan 30 20:25:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca4bf16

app-emulation/free42: Drops old version 2.0.8

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-emulation/free42/Manifest  |  1 -
 .../files/free42-2.0.8-fix-build-intel-lib.patch   | 12 -
 .../free42/files/free42-2.0.8-fix-makefile.patch   | 58 --
 app-emulation/free42/free42-2.0.8.ebuild   | 49 --
 4 files changed, 120 deletions(-)

diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index ac6866f07ec..5b013b2944a 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,3 +1,2 @@
 DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B 
a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a
 SHA512 
4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 
708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be
 SHA512 
078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d
-DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B 
e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff
 SHA512 
3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee

diff --git a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch 
b/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch
deleted file mode 100644
index df2736f01e3..000
--- a/app-emulation/free42/files/free42-2.0.8-fix-build-intel-lib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
 a/gtk/build-intel-lib.sh   2017-12-26 19:48:08.0 +0100
-+++ b/gtk/build-intel-lib.sh   2017-12-26 21:09:52.949997834 +0100
-@@ -4,7 +4,7 @@
- cd IntelRDFPMathLib20U1
- patch -p0 <../intel-lib-linux.patch
- cd LIBRARY
--make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
-+make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 
UNCHANGED_BINARY_FLAGS=0
- mv libbid.a ../../gcc111libbid.a
- cd ../..
- ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d 
'\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo 
'0 };'; echo '#endif' ) > readtest_lines.cc

diff --git a/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch 
b/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch
deleted file mode 100644
index 2cb44245c3b..000
--- a/app-emulation/free42/files/free42-2.0.8-fix-makefile.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nuar a/gtk/Makefile b/gtk/Makefile
 a/gtk/Makefile 2017-12-26 19:48:08.0 +0100
-+++ b/gtk/Makefile 2017-12-26 21:07:20.279998488 +0100
-@@ -15,11 +15,11 @@
- # along with this program; if not, see http://www.gnu.org/licenses/.
- 
###
- 
--CFLAGS = -MMD \
-+CFLAGS := -MMD \
--Wall \
--Wno-parentheses \
--Wno-write-strings \
--   -g \
-+   -Wno-error=narrowing \
--I/usr/X11R6/include \
-$(shell pkg-config --cflags gtk+-2.0) \
--DVERSION="\"$(shell cat ../VERSION)\"" \
-@@ -27,21 +27,25 @@
--DDECIMAL_GLOBAL_ROUNDING=1 \
--DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
--DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
--   -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
-+   -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
-+   ${CFLAGS}
- 
--CXXFLAGS = $(CFLAGS) \
-+CXXFLAGS := $(CFLAGS) \
--fno-exceptions \
--fno-rtti \
--   -D_WCHAR_T_DEFINED
-+   -D_WCHAR_T_DEFINED \
-+   ${CXXFLAGS}
- 
--LDFLAGS = -L/usr/X11R6/lib
--LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
-+MYLDFLAGS = -L/usr/X11R6/lib
-+LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
- 
- ifeq "$(shell uname -s)" "Linux"
--LDFLAGS += -Wl,--hash-style=both
-+MYLDFLAGS += -Wl,--hash-style=both
- LIBS += -lpthread
- endif
- 
-+MYLDFLAGS += ${LDFLAGS}
-+
- SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
-   shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
-   core_commands3.cc core_commands4.cc core_commands5.cc \
-@@ -83,7 +87,7 @@
- endif
- 
- $(EXE): $(OBJS)
--  $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
-+  $(CXX) -o $(EXE) 

[gentoo-commits] proj/bouncer:master commit in: perl/, /

[Brian Evans]

commit: 494c353d1b7cbdc66219fbdddc93a254a10d0b29
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 20:18:10 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 20:18:10 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=494c353d

Add sentry.pl with config moved to its own file

 .gitignore|   1 +
 perl/db.dist.conf |   7 
 perl/sentry.pl| 102 ++
 3 files changed, 110 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3a7b40c..1dfa684 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 php/cfg/config.php
 php/cfg/config.php.orig
+perl/db.conf

diff --git a/perl/db.dist.conf b/perl/db.dist.conf
new file mode 100644
index 000..0540d3b
--- /dev/null
+++ b/perl/db.dist.conf
@@ -0,0 +1,7 @@
+# Some db credentials
+[database]
+host = localhost
+user = username
+pass = password
+db = database
+

diff --git a/perl/sentry.pl b/perl/sentry.pl
new file mode 100755
index 000..bc4788c
--- /dev/null
+++ b/perl/sentry.pl
@@ -0,0 +1,102 @@
+#!/usr/bin/perl
+
+# Given a bunch of IP's figure out how fast you can look up their
+#   regions and then determine how good we are at this.
+
+use locale;
+use DBI;
+use Data::Dumper;
+use LWP;
+use LWP::UserAgent;
+use Config::Tiny;
+
+$ua = LWP::UserAgent->new;
+$ua->timeout(4);
+$ua->agent("Gentoo Mirror Monitor/1.0");
+
+my $DEBUG = 1;
+my %products = ();
+my %oss = ();
+my $Config = Config::Tiny->read( 'db.conf' );
+
+# Some db credentials
+my $host = $Config->{database}->{host};
+my $user = $Config->{database}->{user};
+my $pass = $Config->{database}->{pass};
+my $db = $Config->{database}->{db};
+
+my $dbh = DBI->connect( "DBI:mysql:$db:$host",$user,$pass) or die "Connecting 
: $dbi::errstr\n";
+$location_sql = qq{SELECT * FROM mirror_locations JOIN mirror_products USING 
(product_id) WHERE product_priority > 0 ORDER BY product_priority DESC};
+#$mirror_sql = qq{SELECT * FROM mirror_mirrors WHERE mirror_active IN ('1') 
ORDER BY mirror_rating DESC, mirror_name};
+$mirror_sql = qq{SELECT * FROM mirror_mirrors WHERE mirror_active IN ('1') 
ORDER BY RAND()};
+$update_sql = qq{REPLACE mirror_location_mirror_map SET 
location_id=?,mirror_id=?,location_active=?};
+
+my $location_sth = $dbh->prepare($location_sql);
+my $mirror_sth = $dbh->prepare($mirror_sql);
+my $update_sth = $dbh->prepare($update_sql);
+
+# populate a product and os hash if we're debugging stuff
+#  this way we don't have to make too many selects against the DB
+if ( $DEBUG ) {
+   print "Getting raw\n";
+   my $product_sql = qq{SELECT * FROM mirror_products};
+   my $oss_sql = qq{SELECT * FROM mirror_os};
+
+   my $product_sth = $dbh->prepare($product_sql);
+   $product_sth->execute();
+
+   while ( my $product = $product_sth->fetchrow_hashref() ) {
+   $products{$product->{product_id}} = $product->{product_name};
+   }
+
+   $oss_sth = $dbh->prepare($oss_sql);
+$oss_sth->execute();
+
+while ( my $os = $oss_sth->fetchrow_hashref() ) {
+$oss{$os->{os_id}} = $os->{os_name};
+}
+}
+
+# let's build the location information
+print "Building location info\n";
+$location_sth->execute();
+my @locations = ();
+
+while (my $location = $location_sth->fetchrow_hashref() ) {
+   push(@locations, $location);
+}
+
+print "Building location info\n";
+$mirror_sth->execute();
+
+while (my $mirror = $mirror_sth->fetchrow_hashref() ) {
+   print "Testing $mirror->{mirror_baseurl}\n";
+
+   foreach my $location (@locations) {
+   my $req = HTTP::Request->new(HEAD => $mirror->{mirror_baseurl} 
. $location->{location_path});
+   my $res;
+   #next if !($location->{location_path} =~ /2009/);
+   #next if !($location->{location_path} =~ /10.0\//);
+   $res = $ua->request($req);
+
+   if ( $res->{_rc} == 200 ) {
+   print "$mirror->{mirror_name} for 
$products{$location->{product_id}} on $oss{$location->{os_id}} is okay.\n" if 
$DEBUG;
+   $update_sth->execute($location->{location_id}, 
$mirror->{mirror_id}, '1');
+   }
+   else {
+   print "$mirror->{mirror_name} for 
$products{$location->{product_id}} on $oss{$location->{os_id}} FAILED.\n" if 
$DEBUG;
+   $update_sth->execute($location->{location_id}, 
$mirror->{mirror_id}, '0');
+   }
+
+   # content-type == text/plain hack here for Mac dmg's
+   #if ( $location->{os_id} == 4 ) {
+   #   print "Testing: $products{$location->{product_id}} on 
$oss{$location->{os_id}} content-type: " .
+#$res->{_headers}->{'content-type'} . "\n" if $DEBUG;
+   #   if ( $res->{_headers}->{'content-type'} !~ 
/application\/octet-stream/ &&
+#$res->{_headers}->{'content-type'} !~ 

[gentoo-commits] proj/bouncer:master commit in: php/lib/, php/admin/

[Brian Evans]

commit: 7d0f0bf7d27e662293c71ea45c8f73241012537f
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 19:04:32 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 19:04:32 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=7d0f0bf7

Update lib/list to be the class ListOut

 php/admin/index.php |  2 +-
 php/admin/locations.php |  2 +-
 php/admin/lstats.php|  2 +-
 php/admin/mstats.php|  2 +-
 php/admin/os.php|  2 +-
 php/admin/products.php  |  2 +-
 php/admin/pstats.php|  2 +-
 php/admin/regions.php   |  2 +-
 php/admin/users.php |  2 +-
 php/lib/list.php| 56 ++---
 10 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/php/admin/index.php b/php/admin/index.php
index aceae66..1e08189 100644
--- a/php/admin/index.php
+++ b/php/admin/index.php
@@ -98,7 +98,7 @@ $actions = array(
 );
 
 form_start();
-show_list($mirrors,$headers,'radio',$actions);
+ListOut::show($mirrors,$headers,'radio',$actions);
 form_end();
 
 echo 'Add a Mirror';

diff --git a/php/admin/locations.php b/php/admin/locations.php
index 138cff1..029594e 100644
--- a/php/admin/locations.php
+++ b/php/admin/locations.php
@@ -87,7 +87,7 @@ $actions = array(
 );
 
 form_start();
-show_list($locations,$headers,'radio',$actions);
+ListOut::show($locations,$headers,'radio',$actions);
 form_end();
 
 echo 'Add a Location';

diff --git a/php/admin/lstats.php b/php/admin/lstats.php
index 9416eb5..667d9cb 100644
--- a/php/admin/lstats.php
+++ b/php/admin/lstats.php
@@ -51,7 +51,7 @@ echo 'Location Statistics';
 
 echo 'This shows whether or not a server is serving up a certain file.';
 
-show_list($stats,$headers,'simple');
+ListOut::show($stats,$headers,'simple');
 
 echo 'Save
 this page as CSV ';
 

diff --git a/php/admin/mstats.php b/php/admin/mstats.php
index 284dcf4..46c1b89 100644
--- a/php/admin/mstats.php
+++ b/php/admin/mstats.php
@@ -26,6 +26,6 @@ $headers = array(
 'region_name'=>'Region'
 );
 
-show_list($stats,$headers,'simple');
+ListOut::show($stats,$headers,'simple');
 
 require_once(FOOTER);

diff --git a/php/admin/os.php b/php/admin/os.php
index 731d405..8be6c0e 100644
--- a/php/admin/os.php
+++ b/php/admin/os.php
@@ -87,7 +87,7 @@ $actions = array(
 );
 
 form_start();
-show_list($oss,$headers,'radio',$actions);
+ListOut::show($oss,$headers,'radio',$actions);
 form_end();
 
 echo 'Add a OS';

diff --git a/php/admin/products.php b/php/admin/products.php
index 962a3cd..fbf5e87 100644
--- a/php/admin/products.php
+++ b/php/admin/products.php
@@ -88,7 +88,7 @@ $actions = array(
 );
 
 form_start();
-show_list($products,$headers,'radio',$actions);
+ListOut::show($products,$headers,'radio',$actions);
 form_end();
 
 echo 'Add a Product';

diff --git a/php/admin/pstats.php b/php/admin/pstats.php
index ef887bd..5e2e593 100644
--- a/php/admin/pstats.php
+++ b/php/admin/pstats.php
@@ -23,6 +23,6 @@ $headers = array(
 'product_name'=>'Product'
 );
 
-show_list($stats,$headers,'simple');
+ListOut::show($stats,$headers,'simple');
 
 require_once(FOOTER);

diff --git a/php/admin/regions.php b/php/admin/regions.php
index f2b6b54..370f953 100644
--- a/php/admin/regions.php
+++ b/php/admin/regions.php
@@ -88,7 +88,7 @@ $actions = array(
 );
 
 form_start();
-show_list($regions,$headers,'radio',$actions);
+ListOut::show($regions,$headers,'radio',$actions);
 form_end();
 
 echo 'Add a Region';

diff --git a/php/admin/users.php b/php/admin/users.php
index 4814f0d..c200a70 100644
--- a/php/admin/users.php
+++ b/php/admin/users.php
@@ -91,7 +91,7 @@ $actions = array(
 );
 
 form_start();
-show_list($users,$headers,'radio',$actions);
+ListOut::show($users,$headers,'radio',$actions);
 form_end();
 
 echo 'Add a User';

diff --git a/php/lib/list.php b/php/lib/list.php
index 86334c0..4709769 100644
--- a/php/lib/list.php
+++ b/php/lib/list.php
@@ -1,13 +1,13 @@
  
- * 
+ * @author Mike Morgan 
+ *
  * Usage example:
  * 
- * $orderby=get_order();
+ * $orderby=List::getOrder();
  * $query="SELECT * FROM fic_courses $orderby";
  * $courses=DB::get($query,PDO::FETCH_ASSOC);
  * $headers=array(
@@ -20,7 +20,7 @@
  * 'active'=>'Active?',
  * 'entry_date'=>'Created'
  * );
- * show_list($courses,$headers);
+ * List::show($courses,$headers);
  * 
  *
  * Accompanying CSS for table output:
@@ -97,17 +97,19 @@
  * 
  */
 
+class ListOut {
+
 /**
  * Show a list of values, for forms.
  * @param array $list associative array
  * @param array $headers column name => column title (for table heads)
  * @param string $type checkbox, radio, simple
- * @param array $array actions to display in actions select list 
+ * @param array $array actions to display in actions select list
  * @param string $form_id id of form holding list
  * @param bool $sortable whether or not to show 

[gentoo-commits] repo/gentoo:master commit in: app-misc/email2trac/

[Amy Liffey]

commit: 7e039b57751a976f3e55941ebc0531f73c78abc1
Author: Amy Liffey  gentoo  org>
AuthorDate: Tue Jan 30 19:48:35 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Tue Jan 30 19:48:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e039b57

app-misc/email2trac: remove inactive maintainer

Closes: https://bugs.gentoo.org/633000
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 app-misc/email2trac/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
index e2500e65d77..ad70e38f24e 100644
--- a/app-misc/email2trac/metadata.xml
+++ b/app-misc/email2trac/metadata.xml
@@ -1,16 +1,8 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   lu...@dzunko.sk
-   Lukas Dzunko
-   
 
web-a...@gentoo.org
Gentoo Webapps

-
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   
 

[gentoo-commits] proj/portage:master commit in: pym/portage/sync/modules/rsync/, pym/portage/repository/, man/, cnf/

[Michał Górny]

commit: 96801877fa7a151dddc9e44e814214b77e21b383
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 16:43:14 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:39:03 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=96801877

sync-rsync-openpgp-key-path -> generic sync-openpgp-key-path

Rename the 'sync-rsync-openpgp-key-path' to a more generic
'sync-openpgp-key-path'. OpenPGP is the basis of at least three
different verification schemes (git, rsync, snapshots) and at least
two of them use the same keys.

Reviewed-by: Zac Medico  gentoo.org>

 cnf/repos.conf | 2 +-
 man/portage.5  | 9 +
 pym/portage/repository/config.py   | 4 
 pym/portage/sync/modules/rsync/__init__.py | 1 -
 pym/portage/sync/modules/rsync/rsync.py| 8 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cnf/repos.conf b/cnf/repos.conf
index 0d2b1f4be..4a40ff4fc 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -7,7 +7,7 @@ sync-type = rsync
 sync-uri = rsync://rsync.gentoo.org/gentoo-portage
 auto-sync = yes
 sync-rsync-verify-metamanifest = yes
-sync-rsync-openpgp-key-path = 
/var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg
+sync-openpgp-key-path = 
/var/lib/gentoo/gkeys/keyrings/gentoo/release/pubring.gpg
 
 # for daily squashfs snapshots
 #sync-type = squashdelta

diff --git a/man/portage.5 b/man/portage.5
index 84999bd2f..1f6259715 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1071,10 +1071,11 @@ Extra options to give to rsync on repository 
synchronization. It takes
 precedence over a declaration in [DEFAULT] section, that takes
 precedence over PORTAGE_RSYNC_EXTRA_OPTS.
 .TP
-.B sync\-rsync\-openpgp\-key\-path
-Path to the OpenPGP key(ring) used to verify MetaManifest. Used only
-if \fBsync\-rsync\-verify\-metamanifest\fR is enabled. If unset,
-the user's keyring is used.
+.B sync\-openpgp\-key\-path
+Path to the OpenPGP key(ring) used to verify received repository. Used
+only for protocols supporting cryptographic verification, provided
+that the respective verification option is enabled. If unset, the user's
+keyring is used.
 .TP
 .B sync-rsync-vcs-ignore = true|false
 Ignore vcs directories that may be present in the repository. It is the

diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py
index be31ed3b1..d3a622f7c 100644
--- a/pym/portage/repository/config.py
+++ b/pym/portage/repository/config.py
@@ -86,6 +86,7 @@ class RepoConfig(object):
'sync_type', 'sync_umask', 'sync_uri', 'sync_user', 
'thin_manifest',
'update_changelog', '_eapis_banned', '_eapis_deprecated',
'_masters_orig', 'module_specific_options', 
'manifest_required_hashes',
+   'openpgp_key_path',
)
 
def __init__(self, name, repo_opts, local_config=True):
@@ -182,6 +183,9 @@ class RepoConfig(object):
self.strict_misc_digests = repo_opts.get(
'strict-misc-digests', 'true').lower() == 'true'
 
+   self.openpgp_key_path = repo_opts.get(
+   'sync-openpgp-key-path', None)
+
self.module_specific_options = {}
 
# Not implemented.

diff --git a/pym/portage/sync/modules/rsync/__init__.py 
b/pym/portage/sync/modules/rsync/__init__.py
index 14af2120c..27a2548c0 100644
--- a/pym/portage/sync/modules/rsync/__init__.py
+++ b/pym/portage/sync/modules/rsync/__init__.py
@@ -27,7 +27,6 @@ module_spec = {
'validate_config': CheckSyncConfig,
'module_specific_options': (
'sync-rsync-extra-opts',
-   'sync-rsync-openpgp-key-path',
'sync-rsync-vcs-ignore',
'sync-rsync-verify-jobs',
'sync-rsync-verify-metamanifest',

diff --git a/pym/portage/sync/modules/rsync/rsync.py 
b/pym/portage/sync/modules/rsync/rsync.py
index 552ac6f6b..d9d7d56f2 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -87,10 +87,6 @@ class RsyncSync(NewBase):
self.verify_metamanifest = (
self.repo.module_specific_options.get(
'sync-rsync-verify-metamanifest', 
False))
-   # Default to gentoo-keys keyring.
-   self.openpgp_key_path = (
-   self.repo.module_specific_options.get(
-   'sync-rsync-openpgp-key-path', None))
# Support overriding job count.
self.verify_jobs = self.repo.module_specific_options.get(
'sync-rsync-verify-jobs', None)
@@ -276,8 +272,8 @@ class RsyncSync(NewBase):
# if synced successfully, verify 

[gentoo-commits] proj/portage:master commit in: man/, pym/portage/sync/modules/rsync/

[Michał Górny]

commit: 79c21efb36cb45a2586c5141abbf9e4dc65c8ac7
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 18:52:19 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:39:20 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=79c21efb

rsync: Fix *-verify-metamanifest boolean parsing

Fix sync-rsync-verify-metamanifest to correctly parse yes|no. Also
correct the manpage to use those two terms as they were the ones used
in repos.conf and the news item.

Reviewed-by: Zac Medico  gentoo.org>

 man/portage.5   | 4 ++--
 pym/portage/sync/modules/rsync/rsync.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/man/portage.5 b/man/portage.5
index 1f6259715..d4f755f51 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1086,9 +1086,9 @@ directories if appropriate.
 Number of parallel jobs to use when verifying nested Manifests. Defaults
 to the apparent number of processors.
 .TP
-.B sync\-rsync\-verify\-metamanifest = true|false
+.B sync\-rsync\-verify\-metamanifest = yes|no
 Require the repository to contain a signed MetaManifest and verify
-it using \fBapp\-portage/gemato\fR. Defaults to false.
+it using \fBapp\-portage/gemato\fR. Defaults to no.
 
 .RE
 

diff --git a/pym/portage/sync/modules/rsync/rsync.py 
b/pym/portage/sync/modules/rsync/rsync.py
index d9d7d56f2..7c020a563 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -83,10 +83,11 @@ class RsyncSync(NewBase):

self.repo.module_specific_options['sync-rsync-extra-opts']))
 
# Process GLEP74 verification options.
-   # Default verification to 'on' for ::gentoo, 'off' otherwise.
+   # Default verification to 'no'; it's enabled for ::gentoo
+   # via default repos.conf though.
self.verify_metamanifest = (
self.repo.module_specific_options.get(
-   'sync-rsync-verify-metamanifest', 
False))
+   'sync-rsync-verify-metamanifest', 'no') 
in ('yes', 'true'))
# Support overriding job count.
self.verify_jobs = self.repo.module_specific_options.get(
'sync-rsync-verify-jobs', None)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Michał Górny]

commit: 59bd32b5d21950f61776b5e5ec064b43fcc8b78b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 19:15:00 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:31:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59bd32b5

sys-apps/portage: Add rsync-verify? dep on app-crypt/gnupg

Closes: https://bugs.gentoo.org/646134

 sys-apps/portage/portage-2.3.21.ebuild | 1 +
 sys-apps/portage/portage-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sys-apps/portage/portage-2.3.21.ebuild 
b/sys-apps/portage/portage-2.3.21.ebuild
index 4bd08154f1c..b958f895c80 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.21.ebuild
@@ -53,6 +53,7 @@ RDEPEND="
rsync-verify? (
>=app-portage/gemato-10
app-crypt/gentoo-keys
+   app-crypt/gnupg
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 98724289cf7..387db3c964e 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -53,6 +53,7 @@ RDEPEND="
rsync-verify? (
>=app-portage/gemato-10
app-crypt/gentoo-keys
+   app-crypt/gnupg
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (

[gentoo-commits] repo/gentoo:master commit in: sys-libs/libomp/

[Michał Górny]

commit: 0d9c0f4a785d5021d3c01307388d0ecbf0f63cd4
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 19:29:00 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:31:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9c0f4a

sys-libs/libomp: Perform PDS checks only for relevant kernel versions

Update the PDS check logic to apply only when running the Linux kernel,
versions between 4.13 and 4.15. That covers the range of -pf kernels
that have the broken PDS version, and I think we can reasonably assume
users will not be updating the patch along with the kernel.

Also, perform the check only once in pkg_pretend. There is really
no point in repeating it as packages do not alter kernel configuration.

Closes: https://bugs.gentoo.org/638410

 sys-libs/libomp/libomp-4.0.1.ebuild| 24 +++-
 sys-libs/libomp/libomp-5.0.1.ebuild| 24 +++-
 sys-libs/libomp/libomp-6.0..ebuild | 24 +++-
 sys-libs/libomp/libomp-.ebuild | 24 +++-
 4 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/sys-libs/libomp/libomp-4.0.1.ebuild 
b/sys-libs/libomp/libomp-4.0.1.ebuild
index 9e63a216516..7b78f15ca8d 100644
--- a/sys-libs/libomp/libomp-4.0.1.ebuild
+++ b/sys-libs/libomp/libomp-4.0.1.ebuild
@@ -21,7 +21,7 @@ 
SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz;
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="hwloc ompt test"
+IUSE="hwloc kernel_linux ompt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
@@ -42,22 +42,28 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
-CONFIG_CHECK="~!SCHED_PDS"
-ERROR_SCHED_PDS="PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels
->= 4.13-pf11 < 4.14-pf9) do not implement sched_yield() call which
-may result in horrible performance problems with libomp. If you are using one
-of the specified kernel versions, you may want to disable the PDS scheduler."
-
 python_check_deps() {
has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
+kernel_pds_check() {
+   if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+   local CONFIG_CHECK="~!SCHED_PDS"
+   local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+   check_extra_config
+   fi
+}
+
 pkg_pretend() {
-   linux-info_pkg_setup
+   kernel_pds_check
 }
 
 pkg_setup() {
-   linux-info_pkg_setup
use test && python-any-r1_pkg_setup
 }
 

diff --git a/sys-libs/libomp/libomp-5.0.1.ebuild 
b/sys-libs/libomp/libomp-5.0.1.ebuild
index c3c4114ff60..6c5b2b9c352 100644
--- a/sys-libs/libomp/libomp-5.0.1.ebuild
+++ b/sys-libs/libomp/libomp-5.0.1.ebuild
@@ -21,7 +21,7 @@ 
SRC_URI="https://releases.llvm.org/${PV/_//}/openmp-${PV/_/}.src.tar.xz;
 LICENSE="|| ( UoI-NCSA MIT ) MIT LLVM-Grant"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
-IUSE="hwloc ompt test"
+IUSE="hwloc kernel_linux ompt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="hwloc? ( sys-apps/hwloc:0=[${MULTILIB_USEDEP}] )"
@@ -42,22 +42,28 @@ S=${WORKDIR}/openmp-${PV/_/}.src
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
-CONFIG_CHECK="~!SCHED_PDS"
-ERROR_SCHED_PDS="PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels
->= 4.13-pf11 < 4.14-pf9) do not implement sched_yield() call which
-may result in horrible performance problems with libomp. If you are using one
-of the specified kernel versions, you may want to disable the PDS scheduler."
-
 python_check_deps() {
has_version "dev-python/lit[${PYTHON_USEDEP}]"
 }
 
+kernel_pds_check() {
+   if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+   local CONFIG_CHECK="~!SCHED_PDS"
+   local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+   check_extra_config
+   fi
+}
+
 pkg_pretend() {
-   linux-info_pkg_setup
+   kernel_pds_check
 }
 
 pkg_setup() {
-   linux-info_pkg_setup
use test && python-any-r1_pkg_setup
 }
 

diff --git a/sys-libs/libomp/libomp-6.0..ebuild 
b/sys-libs/libomp/libomp-6.0..ebuild
index 30de17ed6c2..01d1bd791b8 100644
--- a/sys-libs/libomp/libomp-6.0..ebuild
+++ b/sys-libs/libomp/libomp-6.0..ebuild
@@ -24,7 +24,7 @@ EGIT_BRANCH="release_60"
 LICENSE="|| ( UoI-NCSA MIT ) MIT 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Michał Górny]

commit: a7ab02c765e783a78fc8aea6a26f41127b2eadc7
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 19:21:12 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:31:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ab02c7

sys-apps/portage: Require USE=ssl on app-crypt/gnupg

Since the the keys provided by app-crypt/gentoo-keys specify hkps://
keyservers, GnuPG needs to be built with SSL/TLS support to be able
to update the keys. Reported by thunderrd on #gentoo-python.

 sys-apps/portage/portage-2.3.21.ebuild | 2 +-
 sys-apps/portage/portage-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.21.ebuild 
b/sys-apps/portage/portage-2.3.21.ebuild
index b958f895c80..62973a379b0 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.21.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
rsync-verify? (
>=app-portage/gemato-10
app-crypt/gentoo-keys
-   app-crypt/gnupg
+   app-crypt/gnupg[ssl(-)]
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 387db3c964e..7913145d58f 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
rsync-verify? (
>=app-portage/gemato-10
app-crypt/gentoo-keys
-   app-crypt/gnupg
+   app-crypt/gnupg[ssl(-)]
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
xattr? ( kernel_linux? (

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Michał Górny]

commit: 8ec1a645932e72285772c4984b92c5a76a1b3d4b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 19:08:44 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:31:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec1a645

sys-apps/portage: Revert "require gemato[gpg] (bug 646134)"

This is the wrong solution. app-portage/gemato has a big fat warning
that you are not supposed to depend on its USE flags.

 sys-apps/portage/portage-2.3.21.ebuild | 2 +-
 sys-apps/portage/portage-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.21.ebuild 
b/sys-apps/portage/portage-2.3.21.ebuild
index 3bae3f2e389..4bd08154f1c 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.21.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
>=app-misc/pax-utils-0.1.17
rsync-verify? (
-   >=app-portage/gemato-10[gpg,-portage-postsync(-)]
+   >=app-portage/gemato-10
app-crypt/gentoo-keys
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index b774af20681..98724289cf7 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
>=app-misc/pax-utils-0.1.17
rsync-verify? (
-   >=app-portage/gemato-10[gpg,-portage-postsync(-)]
+   >=app-portage/gemato-10
app-crypt/gentoo-keys
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

[gentoo-commits] proj/portage:master commit in: man/, pym/portage/sync/modules/rsync/

[Michał Górny]

commit: e27762011461e8fb4761412a96ede630740684eb
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 16:39:58 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 19:15:55 2018 +
URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=e2776201

rsync: Support overriding number of jobs for verification

Requested-by: Ulrich Müller  gentoo.org>
Reviewed-by: Zac Medico  gentoo.org>

 man/portage.5  | 4 
 pym/portage/sync/modules/rsync/__init__.py | 1 +
 pym/portage/sync/modules/rsync/rsync.py| 5 +
 3 files changed, 10 insertions(+)

diff --git a/man/portage.5 b/man/portage.5
index 2d444a86f..84999bd2f 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1081,6 +1081,10 @@ Ignore vcs directories that may be present in the 
repository. It is the
 user's responsibility to set sync-rsync-extra-opts to protect vcs
 directories if appropriate.
 .TP
+.B sync\-rsync\-verify\-jobs
+Number of parallel jobs to use when verifying nested Manifests. Defaults
+to the apparent number of processors.
+.TP
 .B sync\-rsync\-verify\-metamanifest = true|false
 Require the repository to contain a signed MetaManifest and verify
 it using \fBapp\-portage/gemato\fR. Defaults to false.

diff --git a/pym/portage/sync/modules/rsync/__init__.py 
b/pym/portage/sync/modules/rsync/__init__.py
index df9a1995a..14af2120c 100644
--- a/pym/portage/sync/modules/rsync/__init__.py
+++ b/pym/portage/sync/modules/rsync/__init__.py
@@ -29,6 +29,7 @@ module_spec = {
'sync-rsync-extra-opts',
'sync-rsync-openpgp-key-path',
'sync-rsync-vcs-ignore',
+   'sync-rsync-verify-jobs',
'sync-rsync-verify-metamanifest',
),
}

diff --git a/pym/portage/sync/modules/rsync/rsync.py 
b/pym/portage/sync/modules/rsync/rsync.py
index 47f0e1ea3..552ac6f6b 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -91,6 +91,9 @@ class RsyncSync(NewBase):
self.openpgp_key_path = (
self.repo.module_specific_options.get(
'sync-rsync-openpgp-key-path', None))
+   # Support overriding job count.
+   self.verify_jobs = self.repo.module_specific_options.get(
+   'sync-rsync-verify-jobs', None)
 
# Real local timestamp file.
self.servertimestampfile = os.path.join(
@@ -275,6 +278,8 @@ class RsyncSync(NewBase):
command = ['gemato', 'verify', '-s', self.repo.location]
if self.openpgp_key_path is not None:
command += ['-K', self.openpgp_key_path]
+   if self.verify_jobs is not None:
+   command += ['-j', self.verify_jobs]
exitcode = portage.process.spawn(command, 
**self.spawn_kwargs)
 
return (exitcode, updatecache_flg)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

[Jonathan Scruggs]

commit: 1f42d5c611fea036935b4a59b2cfbde2863e1c12
Author: Jonathan Scruggs  gentoo  org>
AuthorDate: Mon Jan 29 14:57:36 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 18:42:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f42d5c6

media-gfx/blender: add fix to build with osl 1.9

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 media-gfx/blender/blender-2.79-r1.ebuild   | 290 +
 .../blender-2.79-fix-build-with-OSL-1.9.x.patch|  26 ++
 2 files changed, 316 insertions(+)

diff --git a/media-gfx/blender/blender-2.79-r1.ebuild 
b/media-gfx/blender/blender-2.79-r1.ebuild
new file mode 100644
index 000..108783768d0
--- /dev/null
+++ b/media-gfx/blender/blender-2.79-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
+   pax-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org;
+
+SRC_URI="http://download.blender.org/source/${P}.tar.gz;
+
+# Blender can have letters in the version string,
+# so strip of the letter if it exists.
+MY_PV="$(get_version_component_range 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
+   cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+   llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+   osl player sdl sndfile test tiff valgrind"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   player? ( game-engine !headless )
+   cuda? ( cycles )
+   cycles? ( openexr tiff openimageio )
+   opencl? ( cycles )
+   osl? ( cycles llvm )"
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/boost-1.62:=[nls?,threads(+)]
+   dev-libs/lzo:2
+   >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   media-libs/freetype
+   media-libs/glew:*
+   media-libs/libpng:0=
+   media-libs/libsamplerate
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:0=
+   virtual/libintl
+   virtual/opengl
+   collada? ( >=media-libs/opencollada-1.6.18:= )
+   colorio? ( media-libs/opencolorio )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
+   ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+   libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+   fftw? ( sci-libs/fftw:3.0= )
+   !headless? (
+   x11-libs/libX11
+   x11-libs/libXi
+   x11-libs/libXxf86vm
+   )
+   jack? ( virtual/jack )
+   jemalloc? ( dev-libs/jemalloc:= )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   llvm? ( sys-devel/llvm:= )
+   ndof? (
+   app-misc/spacenavd
+   dev-libs/libspnav
+   )
+   nls? ( virtual/libiconv )
+   openal? ( media-libs/openal )
+   opencl? ( virtual/opencl )
+   openimageio? ( >=media-libs/openimageio-1.7.0 )
+   openexr? (
+   >=media-libs/ilmbase-2.2.0:=
+   >=media-libs/openexr-2.2.0:=
+   )
+   opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+   openvdb? (
+   
media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)]
+   dev-cpp/tbb
+   >=dev-libs/c-blosc-1.5.2
+   )
+   osl? ( media-libs/osl:= )
+   sdl? ( media-libs/libsdl2[sound,joystick] )
+   sndfile? ( media-libs/libsndfile )
+   tiff? ( media-libs/tiff:0 )
+   valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   >=dev-cpp/eigen-3.2.8:3
+   nls? ( sys-devel/gettext )
+   doc? (
+   app-doc/doxygen[-nodot(-),dot(+),latex]
+   dev-python/sphinx[latex]
+   )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-fix-install-rules.patch"
+   "${FILESDIR}/${P}-fix-build-with-OSL-1.9.x.patch"
+)
+
+blender_check_requirements() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+   if use doc; then
+   CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+   fi
+}
+
+pkg_pretend() {
+   blender_check_requirements
+}
+
+pkg_setup() {
+   blender_check_requirements
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # we don't want static glew, but it's scattered across
+   # multiple files that differ from version to version
+   # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+   local file
+   while IFS="" read -d $'\0' -r file ; do
+   sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+   done < <(find . -type f -name "CMakeLists.txt")
+
+   # Disable MS Windows help 

[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/

[Jonathan Scruggs]

commit: 94c37b80b56ebc0689537c1996b2768aa57d88f5
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Jan 27 17:10:44 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 18:43:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c37b80

sci-libs/vtk: Fix building with doc and xdmf2 use flags

Closes: https://bugs.gentoo.org/645640
Closes: https://github.com/gentoo/gentoo/pull/6977

 sci-libs/vtk/vtk-8.1.0-r1.ebuild | 332 +++
 1 file changed, 332 insertions(+)

diff --git a/sci-libs/vtk/vtk-8.1.0-r1.ebuild b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
new file mode 100644
index 000..2ca414fc352
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.1.0-r1.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils versionator 
toolchain-funcs cmake-utils virtualx webapp
+
+# Short package version
+SPV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="The Visualization Toolkit"
+HOMEPAGE="https://www.vtk.org/;
+SRC_URI="
+   https://www.vtk.org/files/release/${SPV}/VTK-${PV}.tar.gz
+   doc? ( https://www.vtk.org/files/release/${SPV}/vtkDocHtml-${PV}.tar.gz 
)
+   examples? (
+   https://www.vtk.org/files/release/${SPV}/VTKData-${PV}.tar.gz
+   
https://www.vtk.org/files/release/${SPV}/VTKLargeData-${PV}.tar.gz
+   )"
+
+LICENSE="BSD LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="
+   all-modules aqua boost doc examples imaging ffmpeg gdal java json kaapi 
mpi
+   mysql odbc offscreen postgres python qt5 rendering tbb theora tk tcl
+   video_cards_nvidia views web R +X xdmf2"
+
+REQUIRED_USE="
+   all-modules? ( python xdmf2 boost )
+   java? ( qt5 )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   tcl? ( rendering )
+   examples? ( python )
+   tk? ( tcl )
+   web? ( python )
+   ^^ ( X aqua offscreen )"
+
+RDEPEND="
+   app-arch/lz4
+   dev-libs/expat
+   dev-libs/jsoncpp:=
+   dev-libs/libxml2:2
+   >=media-libs/freetype-2.5.4
+   >=media-libs/libharu-2.3.0-r2
+   media-libs/libpng:0=
+   media-libs/libtheora
+   media-libs/mesa
+   media-libs/tiff:0
+   sci-libs/exodusii
+   sci-libs/hdf5:=
+   sci-libs/netcdf-cxx:3
+   sys-libs/zlib
+   virtual/jpeg:0
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXmu
+   x11-libs/libXt
+   boost? ( dev-libs/boost:=[mpi?] )
+   examples? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   )
+   ffmpeg? ( virtual/ffmpeg )
+   gdal? ( sci-libs/gdal )
+   java? ( >=virtual/jdk-1.7:* )
+   kaapi? ( > "${T}"/40${PN} <<- EOF || die
+   VTK_DATA_ROOT=${EPREFIX}/usr/share/${PN}/data
+   VTK_DIR=${EPREFIX}/usr/$(get_libdir)/${PN}-${SPV}
+   VTKHOME=${EPREFIX}/usr
+   EOF
+   doenvd "${T}"/40${PN}
+
+   use web && webapp_src_install
+}
+
+# webapp.eclass exports these but we want it optional #534036
+pkg_postinst() {
+   use web && webapp_pkg_postinst
+}
+
+pkg_prerm() {
+   use web && webapp_pkg_prerm
+}

[gentoo-commits] proj/bouncer:master commit in: php/

[Brian Evans]

commit: e488c9e9fcea1caf476c2ddfb711b1244f64b8c9
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 18:30:50 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 18:30:50 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=e488c9e9

Remove a debugging statement from index

 php/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/php/index.php b/php/index.php
index aeb7128..b925502 100644
--- a/php/index.php
+++ b/php/index.php
@@ -62,7 +62,6 @@ if (!empty($_GET['os'])&&!empty($_GET['product'])) {
 
 // otherwise, by default, redirect them and exit
 header('Location: 
'.$mirror['mirror_baseurl'].$location['location_path']);
-   var_dump($mirror);
 exit;
 }
 }

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

[Michał Górny]

commit: cdbac832c1d38c302486d4f4b525ae99b93de673
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 17:57:49 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 18:19:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdbac832

dev-python/pysha3: Fix tests on PyPy and enable PyPy support

Remove the meaningless AttributeError tests that checked for Python
implementation correctness more than anything relevant to pysha3 users.
This fixes PyPy test failures and allows us to enable PyPy support.

 dev-python/pysha3/pysha3-1.0.2-r1.ebuild | 32 
 1 file changed, 32 insertions(+)

diff --git a/dev-python/pysha3/pysha3-1.0.2-r1.ebuild 
b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
new file mode 100644
index 000..2ce78133003
--- /dev/null
+++ b/dev-python/pysha3/pysha3-1.0.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+inherit distutils-r1
+
+DESCRIPTION="SHA-3 (Keccak) for Python 2.7 - 3.5"
+HOMEPAGE="https://github.com/tiran/pysha3 https://pypi.python.org/pypi/pysha3;
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="CC0-1.0 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+   # Remove meaningless AttributeError checks. They don't really test
+   # the implementation but Python implementation behavior, and they
+   # fail with PyPy. Oh yes, and this doesn't affect correctly written
+   # programs.
+   sed -i -e '/AttributeError/d' tests.py || die
+
+   distutils-r1_python_prepare_all
+}
+
+python_test() {
+   esetup.py test
+}

[gentoo-commits] repo/gentoo:master commit in: app-portage/gemato/

[Michał Górny]

commit: f035d5838dfa13854105cdd4fe9a8e7a4045cb44
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 30 18:01:37 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 30 18:19:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f035d583

app-portage/gemato: Tested on PyPy

 app-portage/gemato/gemato-10.3.ebuild | 4 ++--
 app-portage/gemato/gemato-.ebuild | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-portage/gemato/gemato-10.3.ebuild 
b/app-portage/gemato/gemato-10.3.ebuild
index 80473b478f6..bd3b3a3c842 100644
--- a/app-portage/gemato/gemato-10.3.ebuild
+++ b/app-portage/gemato/gemato-10.3.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=6
 
-# pyblake2 & pysha3 are broken with pypy*
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+# pyblake2 & pysha3 are broken with pypy3
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"

diff --git a/app-portage/gemato/gemato-.ebuild 
b/app-portage/gemato/gemato-.ebuild
index 573302e781e..d3694b93c22 100644
--- a/app-portage/gemato/gemato-.ebuild
+++ b/app-portage/gemato/gemato-.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=6
 
-# backports.lzma is broken with pypy
 # pyblake2 & pysha3 are broken with pypy3
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
 inherit distutils-r1 git-r3
 
 DESCRIPTION="Stand-alone Manifest generation & verification tool"

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: c3fb882b2b5a8789cb255ec18f22bc2237fec23d
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 17:32:03 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 17:32:03 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=c3fb882b

Restore headers after they were broken fixing warnings

 php/lib/list.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/php/lib/list.php b/php/lib/list.php
index 8424ae3..86334c0 100644
--- a/php/lib/list.php
+++ b/php/lib/list.php
@@ -213,10 +213,9 @@ function show_headers($headers,$type,$sortable=true)
$a_class=null;
}
}
-   if ($type!='simple'&&$count==0) 
+   if ($type!='simple'&&$count==0)
{
echo "\n".' ';
-   continue;
}
elseif($sortable)
{

[gentoo-commits] proj/bouncer:master commit in: php/

[Brian Evans]

commit: a6b2a6f02cff02b0417ae10a7057ca3e87f337e6
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:41:36 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:41:36 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=a6b2a6f0

Remove old index backup

 php/index.php.orig | 79 --
 1 file changed, 79 deletions(-)

diff --git a/php/index.php.orig b/php/index.php.orig
deleted file mode 100644
index 9cc7791..000
--- a/php/index.php.orig
+++ /dev/null
@@ -1,79 +0,0 @@
-\nprname=%s\n",$os_name,$product_name);
-
-// get os and product IDs
-$os_id = db_name_to_id('mirror_os','os_id','os_name',$os_name);
-$product_id = 
db_name_to_id('mirror_products','product_id','product_name',$product_name);
-
-printf("osid=%s\nprid=%s\n",$os_id,$product_id);
-
-// do we have a valid os and product?
-if (!empty($os_id)&&!empty($product_id)) {
-$location = db_get_one("SELECT location_id,location_path FROM 
mirror_locations WHERE product_id={$product_id} AND os_id={$os_id}");
-
-// did we get a valid location?
-if (!empty($location)) {
-$mirror = db_get_one("SELECT 
mirror_mirrors.mirror_id,mirror_baseurl FROM mirror_mirrors, 
mirror_location_mirror_map WHERE mirror_mirrors.mirror_id = 
mirror_location_mirror_map.mirror_id AND mirror_location_mirror_map.location_id 
= {$location['location_id']} AND mirror_active='1' AND location_active ='1' 
ORDER BY rand()*(1/mirror_rating)");
-
-// did we get a valid mirror?
-if (!empty($mirror)) {
-
-// if logging is enabled, insert log
-if (LOGGING) {
-db_query("UPDATE mirror_mirrors SET 
mirror_count=mirror_count+1 WHERE mirror_id={$mirror['mirror_id']}");
-db_query("UPDATE mirror_products SET 
product_count=product_count+1 WHERE product_id={$product_id}");
-}
-
-// LANGUAGE HACK
-if (!empty($_GET['lang'])) {
-$location['location_path'] = 
str_replace('x86',$_GET['lang'],$location['location_path']);
-$location['location_path'] = 
str_replace('en-US',$_GET['lang'],$location['location_path']);
-}
-   
-   // BitTorrent HACK - robbat2
-   if (!empty($_GET['extra'])) {
-   $extra = $_GET['extra'];
-   $location['location_path'] .= 
ereg_replace('\?.*|&.*','',$extra);
-   }
-
-// if we are just testing, then just print and exit.
-if (!empty($_GET['print'])) {
-print('Location: 
'.$mirror['mirror_baseurl'].$location['location_path']);
-exit;
-}
-
-// otherwise, by default, redirect them and exit
-header('Location: 
'.$mirror['mirror_baseurl'].$location['location_path']);
-exit;
-}
-}
-}
-}
-
-// if we get here, the request was invalid; redirect to mozilla home
-header('Location: http://www.gentoo.org/');
-exit;
-?>

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: a7817026c2caa0dbf0f8961eb8f69f27a9c17f8e
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:43:47 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:43:47 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=a7817026

Update comment in forms lib

 php/lib/forms.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/php/lib/forms.php b/php/lib/forms.php
index 0317949..e435181 100644
--- a/php/lib/forms.php
+++ b/php/lib/forms.php
@@ -641,8 +641,8 @@ function url_out($url)
 }
 
 /**
- * Take a db_get result and return an array of options.
- * @param array $data db_get result
+ * Take a DB::get result and return an array of options.
+ * @param array $data DB::get result
  * @param string $val_col column containing the value for each option
  * @param string $name_col column containing the text
  * @return array $options array of options ($val=>$text)
@@ -656,4 +656,3 @@ function db_get_to_options($data,$val_col,$name_col)
}
return $options;
 }
-?>

[gentoo-commits] proj/bouncer:master commit in: php/inc/, php/admin/, php/lib/

[Brian Evans]

commit: 7502757bdae610d26b53d14c01aec68b17e9fbc3
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 16:33:25 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 16:33:25 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=7502757b

Silence Notices with defaults and reference removals

 php/admin/index.php |  1 +
 php/admin/locations.php |  2 +-
 php/admin/os.php|  3 ++-
 php/admin/products.php  |  1 +
 php/admin/regions.php   |  1 +
 php/admin/users.php |  2 +-
 php/inc/footer.php  |  3 +--
 php/lib/forms.php   | 24 
 php/lib/list.php|  3 ++-
 php/lib/util.php| 23 +++
 10 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/php/admin/index.php b/php/admin/index.php
index e8feaec..aceae66 100644
--- a/php/admin/index.php
+++ b/php/admin/index.php
@@ -103,6 +103,7 @@ form_end();
 
 echo 'Add a Mirror';
 form_start();
+$posts = ['mirror_name' => '', 'region_id' => '', 'mirror_baseurl' => '', 
'mirror_rating' => ''];
 include_once(INC.'/forms/mirror.php');
 form_submit('add-submit','','button1','Add Mirror');
 form_end();

diff --git a/php/admin/locations.php b/php/admin/locations.php
index e868d1a..138cff1 100644
--- a/php/admin/locations.php
+++ b/php/admin/locations.php
@@ -92,9 +92,9 @@ form_end();
 
 echo 'Add a Location';
 form_start();
+$posts = ['product_id' => '','os_id' =>'', 'location_path' => ''];
 include_once(INC.'/forms/location.php');
 form_submit('add-submit','','button1','Add Location');
 form_end();
 
 require_once(FOOTER);
-?>

diff --git a/php/admin/os.php b/php/admin/os.php
index 72bb383..731d405 100644
--- a/php/admin/os.php
+++ b/php/admin/os.php
@@ -92,9 +92,10 @@ form_end();
 
 echo 'Add a OS';
 form_start();
+$posts = ['os_name'=>'', 'os_priority'=>'']; //sane defaults
 include_once(INC.'/forms/os.php');
 form_submit('add-submit','','button1','Add OS');
 form_end();
 
 require_once(FOOTER);
-?>
+

diff --git a/php/admin/products.php b/php/admin/products.php
index cdc20ec..962a3cd 100644
--- a/php/admin/products.php
+++ b/php/admin/products.php
@@ -93,6 +93,7 @@ form_end();
 
 echo 'Add a Product';
 form_start();
+$posts = ['product_name'=>'', 'product_priority'=>'']; //sane defaults
 include_once(INC.'/forms/product.php');
 form_submit('add-submit','','button1','Add Product');
 form_end();

diff --git a/php/admin/regions.php b/php/admin/regions.php
index 0709e43..f2b6b54 100644
--- a/php/admin/regions.php
+++ b/php/admin/regions.php
@@ -93,6 +93,7 @@ form_end();
 
 echo 'Add a Region';
 form_start();
+$posts = ['region_name'=>'', 'region_priority'=>''];
 include_once(INC.'/forms/region.php');
 form_submit('add-submit','','button1','Add Region');
 form_end();

diff --git a/php/admin/users.php b/php/admin/users.php
index 4926117..4814f0d 100644
--- a/php/admin/users.php
+++ b/php/admin/users.php
@@ -96,9 +96,9 @@ form_end();
 
 echo 'Add a User';
 form_start();
+$posts = ['username'=>'', 'user_firstname'=>'', 'user_lastname'=>'', 
'user_email'=>'']; //sane defaults
 include_once(INC.'/forms/user.php');
 form_submit('add-submit','','button1','Add User');
 form_end();
 
 require_once(FOOTER);
-?>

diff --git a/php/inc/footer.php b/php/inc/footer.php
index efa17e7..ef9d0fe 100644
--- a/php/inc/footer.php
+++ b/php/inc/footer.php
@@ -14,11 +14,10 @@ if (!empty($nav)) {
 }
 ?>
 
-Copyright  2005 The Gentoo Foundation, portions 
Copyright  1998-2004 The Mozilla Organization
+Copyright  2005-2018 The Gentoo Foundation, 
portions Copyright  1998-2004 The Mozilla Organization
 
 
 
 
 

diff --git a/php/lib/forms.php b/php/lib/forms.php
index e435181..3ef2c5c 100644
--- a/php/lib/forms.php
+++ b/php/lib/forms.php
@@ -11,23 +11,23 @@
  *  @param bool $slashes default to false, this parameter indicate if 
stripslashes is desired, usually use for magic qoutes
  * @return mixed $str cleaned for HTML
  */
-function clean_out($str, $slashes=FALSE) 
-{ 
+function clean_out($str, $slashes=FALSE)
+{
if (is_array($str))
{
foreach ($str as $key => $val)
{
-   $str[$key] =& clean_out($val, $slashes);
+   $str[$key] = clean_out($val, $slashes);
}
}
else
{
if ($slashes)
-   $str =& trim(htmlentities(stripslashes($str)));
+   $str = trim(htmlentities(stripslashes($str)));
else
-   $str =& trim(htmlentities($str));
+   $str = trim(htmlentities($str));
}
-   
+
return $str;
 }
 
@@ -44,18 +44,18 @@ function clean_in($str, $single_quotes=FALSE, $decode=FALSE)
{
foreach ($str as $key => $val)
{
-   $str[$key] =& clean_in($val, $single_quotes);
+   $str[$key] = clean_in($val, $single_quotes);
}
}
  

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: 584d92e682b2fb5f373953ed28e5b802079d4ccc
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:18:05 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:18:05 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=584d92e6

Fix authentication

 php/lib/auth.php | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/php/lib/auth.php b/php/lib/auth.php
index 68bf91a..610b3c2 100644
--- a/php/lib/auth.php
+++ b/php/lib/auth.php
@@ -14,17 +14,17 @@ class Auth {
  */
 public static function is_valid_session()
 {
-$cookieAdmin = filter_input(INPUT_COOKIE, 'mozilla-mirror-admin');
-if (!empty($cookieAdmin)) {  // check cookie
-$res = DB::query("SELECT * FROM mirror_sessions WHERE session_id = ?", 
[$cookieAdmin]);  // check db for id
+if (session_status() !== PHP_SESSION_ACTIVE) {
+   session_name('mozilla-mirror-admin');
+   session_start();
+}
+if (!empty($_SESSION['user'])) {  // check cookie
+$res = DB::query("SELECT * FROM mirror_sessions WHERE session_id = ?", 
[session_id()]);  // check db for id
 if ($res && DB::numrows($res)>0) {
 $buf = DB::fetch($res,PDO::FETCH_ASSOC);
 // comment line below to disable gc and allow multiple sessions 
per username
-DB::query("DELETE FROM mirror_sessions WHERE username=? AND 
session_id != ?", [$buf['username'], $cookieAdmin]);  // garbage collection
+DB::query("DELETE FROM mirror_sessions WHERE username=? AND 
session_id != ?", [$buf['username'], session_id()]);  // garbage collection
 $user = DB::fetch(DB::query("SELECT * FROM mirror_users WHERE 
username=?", [$buf['username']]),PDO::FETCH_ASSOC);
-if (empty($_SESSION)) {
-static::create_session($user);  // if session isn't started, 
create it and push user data
-}
 return true;
 }
 }
@@ -74,7 +74,7 @@ public static function create_session($user,$secure=0)
 session_name('mozilla-mirror-admin');
 session_set_cookie_params(0,'/',$_SERVER['HTTP_HOST'],$secure);
 session_start();
-DB::query("INSERT INTO mirror_sessions(session_id,username) VALUES(?,?)", 
[session_id(), $user['username']]);
+DB::query("INSERT IGNORE INTO mirror_sessions(session_id,username) 
VALUES(?,?)", [session_id(), $user['username']]);
 $_SESSION['user']=$user;
 }
 
@@ -84,8 +84,11 @@ public static function create_session($user,$secure=0)
 public static function logout()
 {
 // comment line below to keep gc from deleting other sessions for this user
-$cookieAdmin = filter_input(INPUT_COOKIE, 'mozilla-mirror-admin');
-DB::query("DELETE FROM mirror_sessions WHERE session_id=? OR username=?", 
[$cookieAdmin, $_SESSION['user']['username']]);
+if (session_status() !== PHP_SESSION_ACTIVE) {
+   session_name('mozilla-mirror-admin');
+   session_start();
+}
+DB::query("DELETE FROM mirror_sessions WHERE session_id=? OR username=?", 
[session_id(), $_SESSION['user']['username']]);
 $_COOKIE = array();
 $_SESSION = array();
 }

[gentoo-commits] proj/bouncer:master commit in: php/admin/

[Brian Evans]

commit: 2d7da95a2cd92341b8ee3792a962d440b1e54f43
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:51:07 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:51:07 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=2d7da95a

Update footer copyright

 php/admin/products.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/php/admin/products.php b/php/admin/products.php
index a0d5187..cdc20ec 100644
--- a/php/admin/products.php
+++ b/php/admin/products.php
@@ -98,4 +98,3 @@ form_submit('add-submit','','button1','Add Product');
 form_end();
 
 require_once(FOOTER);
-?>

[gentoo-commits] proj/bouncer:master commit in: php/lib/, php/, php/admin/

[Brian Evans]

commit: 0184aecdf36ab398ef3696e5211aff53b7239772
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 14:53:01 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 14:53:01 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=0184aecd

Fix query errors and missing indexes; add error handling for user facing

 php/admin/mirror-list.php |  2 +-
 php/index-list.php| 16 
 php/index.php | 23 ---
 php/lib/auth.php  |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/php/admin/mirror-list.php b/php/admin/mirror-list.php
index e0876d4..29f6e9b 100644
--- a/php/admin/mirror-list.php
+++ b/php/admin/mirror-list.php
@@ -40,7 +40,7 @@ if (!empty($_GET['os_id'])&&!empty($_GET['product_id'])) {
 mirror_locations.product_id = ? AND
 mirror_location_mirror_map.location_active = '1' AND
 mirror_mirrors.mirror_active = '1'
-", PDO::FETCH_ASSOC, [$os_id, $product_id]);
+", PDO::FETCH_ASSOC, null, [$os_id, $product_id]);
 
 header("Content-type: text/plain;");
 foreach ($mirrors as $mirror) {

diff --git a/php/index-list.php b/php/index-list.php
index 1b158b7..861ba95 100644
--- a/php/index-list.php
+++ b/php/index-list.php
@@ -7,7 +7,9 @@
 require_once('./cfg/init.php');
 require_once(LIB.'/auth.php');  // auth functions
 require_once(LIB.'/forms.php'); // form library
-error_reporting(E_GET);
+ob_start();
+
+try{
 
 if (!empty($_GET['os'])&&!empty($_GET['product'])) {
 // clean in os and product strings
@@ -44,7 +46,7 @@ if (!empty($os_id)&&!empty($product_id)) {
 mirror_mirrors.mirror_active = '1'
ORDER BY
mirror_rating DESC, mirror_baseurl
-", PDO::FETCH_ASSOC, [$os_id, $product_id]);
+", PDO::FETCH_ASSOC, null, [$os_id, $product_id]);
 
 header("Content-type: text/plain;");
 foreach ($mirrors as $mirror) {
@@ -68,15 +70,21 @@ if (!empty($os_id)&&!empty($product_id)) {
 echo '';
 form_label('Product', 'product','label-small');
 
form_select('product_id','product','',Mirror::get_products_select(),$_GET['product_id']);
-echo ' [edit products]';
+echo ' [edit products]';
 echo '';
 
 echo '';
 form_label('OS', 'os','label-small');
 form_select('os_id','os','',Mirror::get_oss_select(),$_GET['os_id']);
-echo ' [edit operating systems]';
+echo ' [edit operating systems]';
 echo '';
 form_submit('submit','','button1','Update');
 form_end();
 require_once(FOOTER);
 }
+
+} catch (Exception $ex) {
+   header("Status: 500", true, 500);
+   echo "An unexpected error has occurred.";
+   trigger_error($ex->getMessage() . ' ' . $ex->getTraceAsString(), 
E_USER_WARNING);
+}

diff --git a/php/index.php b/php/index.php
index 28b29b8..aeb7128 100644
--- a/php/index.php
+++ b/php/index.php
@@ -4,14 +4,14 @@
  *  @package mirror
  * @subpackage pub
  */
-error_reporting(0);  // hide all errors
+ob_start();
 require_once('./cfg/config.php');  // config file that defines constants
 
 // if we don't have an os, make it windows, playing the odds
 if (empty($_GET['os'])) {
 $_GET['os'] = 'Any';
 }
-
+try{
 // do we even have an os or product?
 if (!empty($_GET['os'])&&!empty($_GET['product'])) {
 require_once(LIB.'/db.php');  // core mysql wrappers
@@ -27,19 +27,19 @@ if (!empty($_GET['os'])&&!empty($_GET['product'])) {
 
 // do we have a valid os and product?
 if (!empty($os_id)&&!empty($product_id)) {
-$location = DB::get_one("SELECT location_id,location_path FROM 
mirror_locations WHERE product_id={$product_id} AND os_id={$os_id}");
+$location = DB::get_one("SELECT location_id,location_path FROM 
mirror_locations WHERE product_id=? AND os_id=?", PDO::FETCH_ASSOC, 
[$product_id, $os_id]);
 
 // did we get a valid location?
 if (!empty($location)) {
-$mirror = DB::get_one("SELECT 
mirror_mirrors.mirror_id,mirror_baseurl FROM mirror_mirrors, 
mirror_location_mirror_map WHERE mirror_mirrors.mirror_id = 
mirror_location_mirror_map.mirror_id AND mirror_location_mirror_map.location_id 
= {$location['location_id']} AND mirror_active='1' AND location_active ='1' 
ORDER BY rand()*(1/mirror_rating)");
+$mirror = DB::get_one("SELECT 
mirror_mirrors.mirror_id,mirror_baseurl FROM mirror_mirrors JOIN 
mirror_location_mirror_map ON mirror_mirrors.mirror_id = 
mirror_location_mirror_map.mirror_id WHERE 
mirror_location_mirror_map.location_id = ? AND mirror_active='1' AND 
location_active ='1' ORDER BY rand()*(1/mirror_rating)", PDO::FETCH_ASSOC, 
[$location['location_id']]);
 
 // did we get a valid mirror?
 if (!empty($mirror)) {
 
 // if logging is enabled, insert log
 if (LOGGING) {
-DB::query("UPDATE mirror_mirrors SET 
mirror_count=mirror_count+1 WHERE 

[gentoo-commits] proj/bouncer:master commit in: php/lib/, php/cfg/

[Brian Evans]

commit: 027ec56ccf00551af10c7c1f3918c6340fdbb956
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:33:33 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:33:33 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=027ec56c

Restore lists

 php/cfg/init.php |  1 +
 php/lib/list.php | 26 --
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/php/cfg/init.php b/php/cfg/init.php
index 3e8f6fb..80f545f 100644
--- a/php/cfg/init.php
+++ b/php/cfg/init.php
@@ -10,6 +10,7 @@ require_once(LIB.'/csv.php');  // util file for random 
functions (no SQL here)
 $start = microtime_float();  // start timer
 require_once(LIB.'/mirror.php');  // user and admin functions for the mirror 
app (some SQL)
 require_once(LIB.'/db.php');  // core mysql wrappers used in mirror functions
+require_once(LIB.'/list.php');
 DB::connect(DBHOST,DBUSER,DBPASS,DBNAME);  // open persistent connection to db
 if (!empty($protect)) {
 require_once('admin_init.php');

diff --git a/php/lib/list.php b/php/lib/list.php
index 5deb5e9..c7e872b 100644
--- a/php/lib/list.php
+++ b/php/lib/list.php
@@ -363,29 +363,3 @@ function 
list_edit_ids($name,$form,$q_front,$q_where='1',$dates=null,$datetimes=
echo 'You must select a record.  Go back.';
}
 }
-
-/**
- * Process a submitted list_edit_ids form.
- * @param array $name array of primary ids posted from the form, these are 
vital to the WHERE clause of the UPDATE statements.
- * @param string $table name of table being affected
- */
-function list_update_ids($name,$table)
-{
-   $keys=array_keys($_POST[$name]);
-   foreach ($keys as $index)
-   {
-   foreach ($_POST as $key=>$val)
-   {
-   if ($key!='submit')
-   {
-   $posts[$index][$key]=$val[$index];
-   }
-   }
-   }
-   foreach ($posts as $dataset)
-   {
-   $query=db_makeupdate($dataset,$table," WHERE 
$name='".$dataset[$name]."' ");
-   db_query($query);
-   }
-}
-?>

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: 200852fe6592cf0e4aa026acf29499542c173806
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:18:07 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:18:07 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=200852fe

Revert "Remove the unused php/lib/list.php"

This reverts commit 011b963d1f61307fa0dbcef713224a0353e5801e.

 php/lib/list.php | 391 +++
 1 file changed, 391 insertions(+)

diff --git a/php/lib/list.php b/php/lib/list.php
new file mode 100644
index 000..5deb5e9
--- /dev/null
+++ b/php/lib/list.php
@@ -0,0 +1,391 @@
+ 
+ * 
+ * Usage example:
+ * 
+ * $orderby=get_order();
+ * $query="SELECT * FROM fic_courses $orderby";
+ * $courses=db_get($query,MYSQL_ASSOC);
+ * $headers=array(
+ * 'course_id'=>'',
+ * 'title'=>'Course Title',
+ * 'date_start_course'=>'Start',
+ * 'date_end_course'=>'End',
+ * 'date_start_reg'=>'Reg Starts',
+ * 'date_end_reg'=>'Reg Ends',
+ * 'active'=>'Active?',
+ * 'entry_date'=>'Created'
+ * );
+ * show_list($courses,$headers);
+ * 
+ *
+ * Accompanying CSS for table output:
+ * 
+ * .list
+ * {
+ * border:1px solid #999;
+ * }
+ * .list th
+ * {
+ * background:#eee;
+ * border:1px solid #000;
+ * font-weight:bold;
+ * }
+ * .list th a
+ * {
+ * display:block;
+ * padding:0 14px;
+ * }
+ * .list th a:hover
+ * {
+ * background-color:#fff;
+ * }
+ * .row1
+ * {
+ * background:#ddd;
+ * }
+ * .row2
+ * {
+ * background:#ccc;
+ * }
+ * .row1:hover, .row2:hover
+ * {
+ * background-color:#fec;
+ * }
+ * .current-sort
+ * {
+ * background:#fda;
+ * }
+ * .sort-desc
+ * {
+ * background:#fec url(../img/up.gif) no-repeat right;
+ * }
+ * .sort-asc
+ * {
+ * background:#fec url(../img/down.gif) no-repeat right;
+ * }
+ * 
+
+ * Accompanying JavaScript for select all / inverse:
+ * 
+ * 
+ * //
+ * 
+ * 
+ */
+
+/**
+ * Show a list of values, for forms.
+ * @param array $list associative array
+ * @param array $headers column name => column title (for table heads)
+ * @param string $type checkbox, radio, simple
+ * @param array $array actions to display in actions select list 
+ * @param string $form_id id of form holding list
+ * @param bool $sortable whether or not to show sortable column headers 
(links in th's)
+ * @param array|string $selected if type is checkbox, array otherwise 
string with one val
+ */
+function 
show_list($list,$headers,$type='checkbox',$actions=null,$form_id=null,$sortable=true,$selected=null)
+{
+   if ( is_array($list) && count($list)>0 && is_array($headers) )
+   {
+   if ( $type!='simple' && !empty($_GET['sort']) && 
!empty($_GET['order']) )
+   {
+   form_hidden('sort',$_GET['sort']);
+   form_hidden('order',$_GET['order']);
+   }
+   echo "\n".'';
+   show_headers($headers,$type,$sortable);
+   echo "\n".'';
+   foreach ($list as $row)
+   {
+   show_row($headers,$row,$type,$count++,$selected);
+   }
+   echo "\n".'';
+   echo "\n".'';
+   if ($type=='checkbox')
+   {
+echo <<
+//
+
+js;
+   echo "\n".' ';
+   }
+   if ($type=='radio'||$type='checkbox-small')
+   {
+   echo '';  
+   }
+   if (is_array($actions)&&$type!='simple')
+   {
+   if (count($actions) == 1) {
+   $actions = array_values($actions);
+   echo '';
+   
form_submit('submit','submit','button1',$actions[0].' ');
+   echo 

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: cbb2b1f5e4b53a08bece7af5426468694a4b0922
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 16:36:02 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 16:36:02 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=cbb2b1f5

Remove old references

 php/lib/csv.php  | 18 +-
 php/lib/util.php |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/php/lib/csv.php b/php/lib/csv.php
index 12dff67..832866f 100644
--- a/php/lib/csv.php
+++ b/php/lib/csv.php
@@ -166,7 +166,7 @@ function csv_csv_to_array($string)
 {
$return = array();
$length = strlen($string);
-   
+
// create a temp file and write the string to it
$tmpfname = tempnam('/tmp', 'csvlib');
$fh = fopen($tmpfname, 'w');
@@ -194,23 +194,23 @@ function csv_csv_to_array($string)
  * @param string $enclosure enclosure character, default to '"'
  * @return  the two dimensional array with the csv file content, or an 
empty if an error occured
  */
-function _csv_file_to_array($filepath, $delimiter=',', $enclosure='"')
+function csv_csv_file_to_array($filepath, $delimiter=',', $enclosure='"')
 {
$return = array();
-   
+
if (!file_exists($filepath) || !is_readable($filepath))
return $return;
-   
-   $fh =& fopen($filepath, 'r');
+
+   $fh = fopen($filepath, 'r');
$size = filesize($filepath)+1;
 
-   while ($data =& fgetcsv($fh, $size, $delimiter, $enclosure))
+   while ($data = fgetcsv($fh, $size, $delimiter, $enclosure))
{
$return[] = $data;
}
-   
+
fclose($fh);
-   
+
return $return;
 }
-?>
+

diff --git a/php/lib/util.php b/php/lib/util.php
index fa95114..c058e2d 100644
--- a/php/lib/util.php
+++ b/php/lib/util.php
@@ -311,9 +311,9 @@ function array_order_by(&$array, $key=null, $order=null, 
$retain_keys=TRUE, $cas
foreach($x as $row_key => $uselessvalue)
{
if ($retain_keys)
-   $return_arr[$row_key] =& $array[$row_key];
+   $return_arr[$row_key] = $array[$row_key];
else
-   $return_arr[] =& $array[$row_key];
+   $return_arr[] = $array[$row_key];
}
 
return $return_arr;

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: 8a8cccee7bc2ff11600bf83b684e627feefeb3d6
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:42:46 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:42:46 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=8a8cccee

Remove unused function from the list lib

 php/lib/list.php | 51 +--
 1 file changed, 1 insertion(+), 50 deletions(-)

diff --git a/php/lib/list.php b/php/lib/list.php
index c7e872b..9f480bc 100644
--- a/php/lib/list.php
+++ b/php/lib/list.php
@@ -9,7 +9,7 @@
  * 
  * $orderby=get_order();
  * $query="SELECT * FROM fic_courses $orderby";
- * $courses=db_get($query,MYSQL_ASSOC);
+ * $courses=DB::get($query,PDO::FETCH_ASSOC);
  * $headers=array(
  * 'course_id'=>'',
  * 'title'=>'Course Title',
@@ -314,52 +314,3 @@ function get_orderby($method='get')
}
else return null;
 }
-
-/**
- * Parses $_POST for ids, shows edit forms for each id with populated data.
- * 
- * name will be used to retrieve an _array_ from $_POST of the same 
name
- * the form will be an include, with $posts[col_name] as the 
default for all values
- * try to keep your query simple (no crazy sorting, etc.) -- 
we're talking one record at a time here anyway
- * 
- * Example:
- * 
- * list_edit_ids('course_id','../forms/course.php','SELECT * FROM 
fic_courses','1');
- * 
- * @param string $name name of id field
- * @param string $form path to form to be used to items
- * @param string $q_front front half of query
- * @param string $q_where where statement
- * @param array $dates array of date field names, so they can be fixed for 
forms
- * @param array $datetimes array of datetime field names, so they can be 
fixed for forms
- */
-function 
list_edit_ids($name,$form,$q_front,$q_where='1',$dates=null,$datetimes=null)
-{
-   if ( !empty($_SESSION[$name]) && is_array($_SESSION[$name]) )
-   {
-   $ids=implode(',',$_SESSION[$name]);
-   $orderby=get_orderby('session');
-   $query=$q_front.' WHERE '.$q_where." AND $name IN($ids) 
".$orderby;
-   $records=db_get($query);
-   form_start($name);
-   foreach ($records as $record)
-   {
-   echo "\n".'';
-   
$record=form_array_fix_dates($dates,$datetimes,2,$record);
-   foreach ($record as $key=>$val)
-   {
-   $posts[$key]=clean_out($val);
-   }
-   include($form);
-   echo "\n".'';
-   form_submit('submit', '', 'button1');
-   echo "\n".'';
-   echo "\n".'';
-   }
-   form_end();
-   }
-   else
-   {
-   echo 'You must select a record.  Go back.';
-   }
-}

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: 1ce3c9c90a14683c6900e9812202c6fa355e53df
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:38:23 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:38:23 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=1ce3c9c9

Remove old db lib backup

 php/lib/db.php.orig | 306 
 1 file changed, 306 deletions(-)

diff --git a/php/lib/db.php.orig b/php/lib/db.php.orig
deleted file mode 100644
index 23dd1ea..000
--- a/php/lib/db.php.orig
+++ /dev/null
@@ -1,306 +0,0 @@
-
- *  db_get("SELECT * FROM table",MYSQL_ASSOC);
- *  returns...
- *  Array
- *  (
- *  [0] => Array
- *  (
- *  [id] => 1
- *  [field1] => data1 
- *  [field2] => data2
- *  )
- *
- *  )
- *  
- */
-function db_get($query,$type=MYSQL_BOTH,$col_id=NULL)
-{
-$res = db_query($query);
-$list = array();
-if (is_resource($res) && !is_null($col_id) && ($type == MYSQL_BOTH || 
$type == MYSQL_ASSOC) && @mysql_num_rows($res) !== 0) {
-$col_test = db_fetch($res,$type);
-@mysql_data_seek($res, 0);
-if (array_key_exists($col_id,$col_test)) {
-while ( $buf = db_fetch($res,$type) ) {
-$list[$buf[$col_id]] = $buf;
-}
-return $list;
-}
-}
-while ( $buf = db_fetch($res,$type) ) {
-$list[] = $buf;
-}
-return $list;
-}
-
-/**
- * Get all of the fieldnames for the specified table.
- * @param string $table name of table to describe
- * @return array array of column names, must be an array 
- */
-function db_fieldnames($table)
-{
-$dbh = db_connect();
-$results = db_query("DESCRIBE $table");
-if (is_resource($results))
-   {
-while ($buf=db_fetch($results))
-   {
-$field_names[] = $buf[0];
-   }
-}
-   else 
-   {
-   $field_names[] = 0;
-   }
-   return $field_names;
-}
-
-/**
- * Create a MySQL INSERT statement based on $_POST array generated by form 
submission.
- * 
- * does not work with mysql functions (PASSWORD, etc.) because 
there are forced double quotes
- * do not use clean_in() before this, or you'll have double 
the slashes
- * use the function only when it saves you time, not 
_always_
- * form items not set will not be processed (unchecked radios, 
checkboxes) - handle these manually, or don't use the func
- * 
- * @param array $vars array of posts
- * @param string $table name of the table that fields will be inserted into
- * @return string $query resulting MySQL insert string
- */
-function db_makeinsert($vars,$table)
-{
-$dbh = db_connect();
-$fields = db_fieldnames($table);
-foreach ($fields as $field)
-   {
-if (get_magic_quotes_gpc) $vars[$field] = stripslashes($vars[$field]);
-$vars[$field] = addslashes($vars[$field]);
-if (isset($vars[$field]))
-   {
-isset($q1)?$q1 .= ','.$field:$q1='INSERT INTO '.$table.'('.$field;
-isset($q2)?$q2 .= ",'$vars[$field]'":$q2=" VALUES('$vars[$field]'";
-}
-}
-$q1 .= ')';
-$q2 .= ')';
-$query = $q1.$q2;
-return $query;
-}
-
-/**
- * Create a MySQL REPLACE statement based on $_POST array generated by 
form submission.
- * 
- * does not work with mysql functions (PASSWORD, etc.) because 
there are forced double quotes
- * do not use clean_in() before this, or you'll have double 
the slashes
- * use the function only when it saves you time, not 
_always_
- * form items not set will not be processed (unchecked radios, 
checkboxes) - handle these manually, or don't use the func
- * 
- * @param array $vars array of posts
- * @param string $table name of the table that fields will be inserted into
- * @return string $query resulting MySQL insert string
- */
-function db_makereplace($vars,$table)
-{
-$dbh = db_connect();
-$fields = db_fieldnames($table);
-foreach ($fields as $field)
-   {
-if (get_magic_quotes_gpc) $vars[$field] = stripslashes($vars[$field]);
-$vars[$field] = addslashes($vars[$field]);
-if (isset($vars[$field]))
-   {
-isset($q1)?$q1 .= ','.$field:$q1='REPLACE INTO '.$table.'('.$field;
-isset($q2)?$q2 .= ",'$vars[$field]'":$q2=" VALUES('$vars[$field]'";
-}
-}
-$q1 .= ')';
-$q2 .= ')';
-$query = $q1.$q2;
-return $query;
-}
-
-/**
- * Create a MySQL UPDATE statement based on $_POST array generated by form 
submission.
- * 
- * does not work with mysql functions (PASSWORD, etc.) because 
there are forced double quotes
- * do not use clean_in() before this, or you'll have double 
the slashes
- * use the function only when 

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: d180173111518d7c87538dafdeac6727d6c6e47a
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 29 21:59:05 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 29 21:59:05 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=d1801731

More database typo fixes

 php/lib/db.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/php/lib/db.php b/php/lib/db.php
index 34e49e3..ae20f9e 100644
--- a/php/lib/db.php
+++ b/php/lib/db.php
@@ -43,7 +43,7 @@ public static function query($qry=null, $parameters=[])
 else return false;
 }
 if(!empty($parameters)) {
-   static::$result = static::$dbh->prepare($query);
+   static::$result = static::$dbh->prepare($qry);
static::$result->execute($parameters);
 }
 else {
@@ -149,7 +149,7 @@ public static function close($dbh=null)
  *  @param int $type result type
  */
 public static function get_one($query,$type=PDO::FETCH_ASSOC,$parameters=[]) {
-$buf = static::get($query.' LIMIT 1',$type,$parameters);
+$buf = static::get($query.' LIMIT 1',$type,null,$parameters);
 return $buf[0];
 }
 
@@ -162,7 +162,7 @@ public static function 
get_one($query,$type=PDO::FETCH_ASSOC,$parameters=[]) {
  */
 public static function name_to_id($table,$id_col,$name_col,$name)
 {
-$buf = static::get_one("SELECT {$id_col} FROM {$table} WHERE {$name_col} = 
:name", PDO::FETCH_NUM, [':name' => $name]);
+$buf = static::get_one("SELECT {$id_col} FROM {$table} WHERE {$name_col} = 
?", PDO::FETCH_NUM, [$name]);
 return $buf[0];
 }
 

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: ef19aa17b0bbdb31ebfc4a2b8744cda8075bd9ff
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 29 21:08:25 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 29 21:08:25 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=ef19aa17

Remove the unused php/lib/list.php

 php/lib/list.php | 391 ---
 1 file changed, 391 deletions(-)

diff --git a/php/lib/list.php b/php/lib/list.php
deleted file mode 100644
index 5deb5e9..000
--- a/php/lib/list.php
+++ /dev/null
@@ -1,391 +0,0 @@
- 
- * 
- * Usage example:
- * 
- * $orderby=get_order();
- * $query="SELECT * FROM fic_courses $orderby";
- * $courses=db_get($query,MYSQL_ASSOC);
- * $headers=array(
- * 'course_id'=>'',
- * 'title'=>'Course Title',
- * 'date_start_course'=>'Start',
- * 'date_end_course'=>'End',
- * 'date_start_reg'=>'Reg Starts',
- * 'date_end_reg'=>'Reg Ends',
- * 'active'=>'Active?',
- * 'entry_date'=>'Created'
- * );
- * show_list($courses,$headers);
- * 
- *
- * Accompanying CSS for table output:
- * 
- * .list
- * {
- * border:1px solid #999;
- * }
- * .list th
- * {
- * background:#eee;
- * border:1px solid #000;
- * font-weight:bold;
- * }
- * .list th a
- * {
- * display:block;
- * padding:0 14px;
- * }
- * .list th a:hover
- * {
- * background-color:#fff;
- * }
- * .row1
- * {
- * background:#ddd;
- * }
- * .row2
- * {
- * background:#ccc;
- * }
- * .row1:hover, .row2:hover
- * {
- * background-color:#fec;
- * }
- * .current-sort
- * {
- * background:#fda;
- * }
- * .sort-desc
- * {
- * background:#fec url(../img/up.gif) no-repeat right;
- * }
- * .sort-asc
- * {
- * background:#fec url(../img/down.gif) no-repeat right;
- * }
- * 
-
- * Accompanying JavaScript for select all / inverse:
- * 
- * 
- * //
- * 
- * 
- */
-
-/**
- * Show a list of values, for forms.
- * @param array $list associative array
- * @param array $headers column name => column title (for table heads)
- * @param string $type checkbox, radio, simple
- * @param array $array actions to display in actions select list 
- * @param string $form_id id of form holding list
- * @param bool $sortable whether or not to show sortable column headers 
(links in th's)
- * @param array|string $selected if type is checkbox, array otherwise 
string with one val
- */
-function 
show_list($list,$headers,$type='checkbox',$actions=null,$form_id=null,$sortable=true,$selected=null)
-{
-   if ( is_array($list) && count($list)>0 && is_array($headers) )
-   {
-   if ( $type!='simple' && !empty($_GET['sort']) && 
!empty($_GET['order']) )
-   {
-   form_hidden('sort',$_GET['sort']);
-   form_hidden('order',$_GET['order']);
-   }
-   echo "\n".'';
-   show_headers($headers,$type,$sortable);
-   echo "\n".'';
-   foreach ($list as $row)
-   {
-   show_row($headers,$row,$type,$count++,$selected);
-   }
-   echo "\n".'';
-   echo "\n".'';
-   if ($type=='checkbox')
-   {
-echo <<
-//
-
-js;
-   echo "\n".' ';
-   }
-   if ($type=='radio'||$type='checkbox-small')
-   {
-   echo '';  
-   }
-   if (is_array($actions)&&$type!='simple')
-   {
-   if (count($actions) == 1) {
-   $actions = array_values($actions);
-   echo '';
-   
form_submit('submit','submit','button1',$actions[0].' ');
-   echo '';
-   } else {
-   

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: 0c00dcb46e650589a387bd042735669402842468
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 29 21:46:39 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 29 21:46:39 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=0c00dcb4

Bug fixes for some typos

 php/lib/db.php | 6 +++---
 php/lib/mirror.php | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/php/lib/db.php b/php/lib/db.php
index 6882064..34e49e3 100644
--- a/php/lib/db.php
+++ b/php/lib/db.php
@@ -7,8 +7,8 @@
 
 class DB {
 
-   private $dsn;
-   private $result;
+   private static $dbh;
+   private static $result;
 /**
  *  Connect to a MySQL database server.
  *  @param string $host db server, defaults to localhost
@@ -20,7 +20,7 @@ public static function 
connect($host='localhost',$user=null,$password=null,$data
 {
 if (!empty($host) && isset($user) && isset($password)) {
$dsn = "mysql:host={$host}";
-   if(!empty($database)) $dsn .= ";database={$database}";
+   if(!empty($database)) $dsn .= ";dbname={$database}";
$options = [PDO::ATTR_EMULATE_PREPARES => false, PDO::ATTR_ERRMODE => 
PDO::ERRMODE_EXCEPTION];
 static::$dbh = new PDO($dsn, $user, $password, $options);
 }

diff --git a/php/lib/mirror.php b/php/lib/mirror.php
index ac3e904..564e33f 100644
--- a/php/lib/mirror.php
+++ b/php/lib/mirror.php
@@ -530,3 +530,5 @@ public static function get_product_stats()
 mirror_locations.product_id
 ");
 }
+
+}

[gentoo-commits] proj/bouncer:master commit in: php/lib/

[Brian Evans]

commit: 2d323e26c63a2f1d11f347a6bb725c095965bda2
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:37:19 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:37:19 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=2d323e26

fix library comments and convert util query

 php/lib/db.php   | 4 ++--
 php/lib/util.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/php/lib/db.php b/php/lib/db.php
index ae20f9e..003be70 100644
--- a/php/lib/db.php
+++ b/php/lib/db.php
@@ -1,6 +1,6 @@
 0)
+   $result = DB::query("SELECT * FROM {$table} WHERE {$column}='{$val}' 
{$extra}");
+   if ($result&&$result->rowCount()>0)
{
return true;
}

[gentoo-commits] proj/bouncer:master commit in: php/rss/, php/lib/, php/cfg/, php/inc/forms/, php/admin/, php/

[Brian Evans]

commit: b167721d5746c0d1791febbb213da0a0aed21aa2
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jan 29 21:07:33 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jan 29 21:07:33 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=b167721d

Modernize the database and mirror libraries

 php/admin/index.php |  13 ++-
 php/admin/locations.php |  10 +-
 php/admin/login.php |   4 +-
 php/admin/logout.php|   4 +-
 php/admin/mirror-list.php   |  25 +++--
 php/admin/mstats.php|   3 +-
 php/admin/os.php|  10 +-
 php/admin/products.php  |  10 +-
 php/admin/pstats.php|   3 +-
 php/admin/regions.php   |  11 +-
 php/admin/users.php |  10 +-
 php/cfg/admin_init.php  |   5 +-
 php/cfg/init.php|   4 +-
 php/inc/forms/location.php  |   6 +-
 php/inc/forms/mirror.php|   3 +-
 php/index-list.php  |  25 +++--
 php/index.php   |  43 
 php/lib/auth.php|  60 +++
 php/lib/csv.php |   4 +-
 php/lib/db.php  | 249 +++-
 php/lib/mirror.php  | 205 ++--
 php/rss/download-counts.php |   6 +-
 22 files changed, 293 insertions(+), 420 deletions(-)

diff --git a/php/admin/index.php b/php/admin/index.php
index 8c3db5c..e8feaec 100644
--- a/php/admin/index.php
+++ b/php/admin/index.php
@@ -9,7 +9,7 @@ require_once('../cfg/init.php');
 
 // add mirror 
 if (!empty($_POST['add-submit'])) {
-if 
(mirror_insert_mirror($_POST['mirror_name'],$_POST['region_id'],$_POST['mirror_baseurl'],$_POST['mirror_rating']))
 {
+if 
(Mirror::insert_mirror($_POST['mirror_name'],$_POST['region_id'],$_POST['mirror_baseurl'],$_POST['mirror_rating']))
 {
 set_msg('Mirror added successfully.');
 header('Location: http://'.$_SERVER['HTTP_HOST'].WEBPATH.'/admin/');
 exit;
@@ -24,7 +24,7 @@ if (!empty($_POST['submit'])) {
 switch($_POST['action']) {
 case 'edit':
 if (!empty($_POST['doit'])) {
-if 
(mirror_update_mirror($_POST['mirror_id'],$_POST['mirror_name'],$_POST['region_id'],$_POST['mirror_baseurl'],$_POST['mirror_rating']))
 {
+if 
(Mirror::update_mirror($_POST['mirror_id'],$_POST['mirror_name'],$_POST['region_id'],$_POST['mirror_baseurl'],$_POST['mirror_rating']))
 {
 set_msg('Mirror updated successfully.');
 header('Location: 
http://'.$_SERVER['HTTP_HOST'].WEBPATH.'/admin/');
 exit;
@@ -36,7 +36,7 @@ if (!empty($_POST['submit'])) {
 $nav = INC.'/admin_nav.php';
 require_once(HEADER);
 echo 'Edit Mirror';
-$posts = mirror_get_one_mirror($_POST['mirror_id']);
+$posts = Mirror::get_one_mirror($_POST['mirror_id']);
 form_start();
 include_once(INC.'/forms/mirror.php');
 form_hidden('doit','1');
@@ -49,14 +49,14 @@ if (!empty($_POST['submit'])) {
 }
 break;
 case 'delete':
-if (mirror_delete_mirror($_POST['mirror_id'])) {
+if (Mirror::delete_mirror($_POST['mirror_id'])) {
 set_msg('Mirror deleted successfully.');
 } else {
 set_error('Mirror could not be deleted.');
 }
 break;
 case 'toggle':
-if (mirror_toggle($_POST['mirror_id'])) {
+if (Mirror::toggle($_POST['mirror_id'])) {
 set_msg('Mirror enabled/disabled.');
 } else {
 set_error('Mirror could not be enabled/disabled.');
@@ -75,7 +75,7 @@ echo 'Mirrors';
 show_error();
 show_msg();
 
-$mirrors = mirror_get_mirrors();
+$mirrors = Mirror::get_mirrors();
 
 $_GET['sort']=(!empty($_GET['sort']))?$_GET['sort']:'mirror_active';
 $_GET['order']=(!empty($_GET['order']))?$_GET['order']:'ASC';
@@ -108,4 +108,3 @@ form_submit('add-submit','','button1','Add Mirror');
 form_end();
 
 require_once(FOOTER);
-?>

diff --git a/php/admin/locations.php b/php/admin/locations.php
index f1bb456..e868d1a 100644
--- a/php/admin/locations.php
+++ b/php/admin/locations.php
@@ -9,7 +9,7 @@ require_once('../cfg/init.php');
 
 // add mirror 
 if (!empty($_POST['add-submit'])&&!empty($_POST['location_path'])) {
-if 
(mirror_insert_location($_POST['product_id'],$_POST['os_id'],$_POST['location_path']))
 {
+if 
(Mirror::insert_location($_POST['product_id'],$_POST['os_id'],$_POST['location_path']))
 {
 set_msg('Location added successfully.');
 header('Location: 
http://'.$_SERVER['HTTP_HOST'].WEBPATH.'/admin/locations.php');
 exit;
@@ -24,7 +24,7 @@ if (!empty($_POST['submit'])) {
 switch($_POST['action']) {
 

[gentoo-commits] proj/bouncer:master commit in: php/admin/

[Brian Evans]

commit: 9247d5ed38132adb3462f03a0c164761d50be6dd
Author: Brian Evans  gentoo  org>
AuthorDate: Tue Jan 30 15:40:48 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 15:40:48 2018 +
URL:https://gitweb.gentoo.org/proj/bouncer.git/commit/?id=9247d5ed

update admin/lstats.php

 php/admin/lstats.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/php/admin/lstats.php b/php/admin/lstats.php
index f7f1900..9416eb5 100644
--- a/php/admin/lstats.php
+++ b/php/admin/lstats.php
@@ -7,7 +7,7 @@
 $protect=1;  // protect this page
 require_once('../cfg/init.php');
 
-$stats = db_get("
+$stats = DB::get("
 SELECT
 IF(mirror_location_mirror_map.location_active='0','DISABLED','ok') as 
location_active,
 mirror_name,
@@ -20,7 +20,7 @@ $stats = db_get("
 WHERE
 mirror_mirrors.mirror_id = mirror_location_mirror_map.mirror_id AND
 mirror_locations.location_id = mirror_location_mirror_map.location_id
-",MYSQL_ASSOC);
+",PDO::FETCH_ASSOC);
 
 $_GET['sort']=(!empty($_GET['sort']))?$_GET['sort']:'location_active';
 $_GET['order']=(!empty($_GET['order']))?$_GET['order']:'ASC';
@@ -56,4 +56,4 @@ show_list($stats,$headers,'simple');
 echo 'Save
 this page as CSV ';
 
 require_once(FOOTER);
-?>
+

[gentoo-commits] proj/bouncer: New branch: master

[Brian Evans]

commit: 
Commit: Brian Evans  gentoo  org>
CommitDate: Tue Jan 30 17:58:05 2018 +

New branch: master

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

[Matthias Maier]

commit: a9cfe9a60acc51a566cdf1b3e3fc769f00cdedc3
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Jan 30 17:30:08 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:54:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cfe9a6

app-emulation/libvirt: version bump to 4.0.0

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-emulation/libvirt/Manifest |   1 +
 app-emulation/libvirt/libvirt-4.0.0.ebuild | 382 +
 2 files changed, 383 insertions(+)

diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 8dbd647bdfb..9ab7b8c8c46 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,2 +1,3 @@
 DIST libvirt-3.10.0.tar.xz 14952220 BLAKE2B 
6af2f4c07dc71d8aa283460640d3fdeccd78616d1678da1decf6b1702984ca0c685d8074963e55a2776ac834e18dbb61d86c20c6032320bf9aa6e02b480526dd
 SHA512 
c2dfe0629bd90e8d7ae85f2a31dc027475c9614d497063fec6905aa2da4db68ce96e8f20d3290b0c0542b6ea31c85700b2727008bac65997ff0901b45f1b7260
 DIST libvirt-3.8.0.tar.xz 14868712 BLAKE2B 
4d97a03c3fe4eadb6d6eb3548231527c7d1a95e2134e63af63e72dcff8fd8d1cc8b5332f03d60edc2b200037ec0276b69a38c3379ce830a595bb5e83c3507e6f
 SHA512 
fc48f29b493a5ec2b3586f6c5df0b8cb81f3f26be847bc42acfb6481d45970edc760dda0232ad57b95b8cf13382d0269dd3edf4a744040cda15b835d32d8c672
+DIST libvirt-4.0.0.tar.xz 15002248 BLAKE2B 
066794909d02be04a7d70ebd5e6d423736fdaf95b7521edd47ef19f9bec4f16d6d3e64117356394ce5916761ad77d5afab84ace2f4828c1f97373d0053b6924b
 SHA512 
c99ea305f427859eb070b5f0c43de48645a5c53a2aa8efc60f54f278ec3fa0b504307861309e1852f8d7bff4436afe00c859aac27691366a0c36c91341cea7a1

diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild 
b/app-emulation/libvirt/libvirt-4.0.0.ebuild
new file mode 100644
index 000..487691cdac3
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-4.0.0.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils user linux-info systemd readme.gentoo-r1
+
+if [[ ${PV} = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+   SRC_URI=""
+   KEYWORDS=""
+   SLOT="0"
+else
+   # Versions with 4 numbers are stable updates:
+   if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+   SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz;
+   else
+   SRC_URI="http://libvirt.org/sources/${P}.tar.xz;
+   fi
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/;
+LICENSE="LGPL-2.1"
+IUSE="
+   apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
+   libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
+   +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
+   wireshark-plugins xen zeroconf zfs
+"
+
+REQUIRED_USE="
+   firewalld? ( virt-network )
+   libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
+   lxc? ( caps libvirtd )
+   openvz? ( libvirtd )
+   policykit? ( dbus )
+   qemu? ( libvirtd )
+   uml? ( libvirtd )
+   vepa? ( macvtap )
+   virt-network? ( libvirtd )
+   virtualbox? ( libvirtd )
+   xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+   app-misc/scrub
+   dev-libs/libgcrypt:0
+   dev-libs/libnl:3
+   >=dev-libs/libxml2-2.7.6
+   || ( >=net-analyzer/netcat6-1.0-r2 
>=net-analyzer/openbsd-netcat-1.105-r1 )
+   >=net-libs/gnutls-1.0.25:0=
+   net-libs/libssh2
+   net-libs/libtirpc
+   net-libs/rpcsvc-proto
+   >=net-misc/curl-7.18.0
+   sys-apps/dmidecode
+   >=sys-apps/util-linux-2.17
+   sys-devel/gettext
+   sys-libs/ncurses:0=
+   sys-libs/readline:=
+   apparmor? ( sys-libs/libapparmor )
+   audit? ( sys-process/audit )
+   caps? ( sys-libs/libcap-ng )
+   dbus? ( sys-apps/dbus )
+   firewalld? ( net-firewall/firewalld )
+   fuse? ( >=sys-fs/fuse-2.8.6:= )
+   glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+   iscsi? ( sys-block/open-iscsi )
+   libssh? ( net-libs/libssh )
+   lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+   nfs? ( net-fs/nfs-utils )
+   numa? (
+   >sys-process/numactl-2.0.2
+   sys-process/numad
+   )
+   parted? (
+   >=sys-block/parted-1.8[device-mapper]
+   sys-fs/lvm2[-device-mapper-only(-)]
+   )
+   pcap? ( >=net-libs/libpcap-1.0.0 )
+   policykit? ( 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/

[Matthias Maier]

commit: 0a987006baf8f3267fb9df03e16baab99bf1f98b
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Jan 30 17:39:01 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:54:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a987006

app-emulation/libvirt: add bashcompletion support

 - also apply two minor bugfixes for version 4.0.0 (hopefully fixed in
   the live version soon.)

Closes: https://bugs.gentoo.org/644632
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 .../libvirt-4.0.0-bash_completion_bugfixes.patch   | 42 ++
 app-emulation/libvirt/libvirt-4.0.0.ebuild |  6 +++-
 app-emulation/libvirt/libvirt-.ebuild  |  7 ++--
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git 
a/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch 
b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
new file mode 100644
index 000..65894ed4e1d
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-4.0.0-bash_completion_bugfixes.patch
@@ -0,0 +1,42 @@
+https://www.redhat.com/archives/libvir-list/2018-January/msg00903.html
+https://www.redhat.com/archives/libvir-list/2018-January/msg00904.html
+
+diff --git a/tools/virsh-completer.c b/tools/virsh-completer.c
+index e216d9076..e3b8234b4 100644
+--- a/tools/virsh-completer.c
 b/tools/virsh-completer.c
+@@ -45,18 +45,11 @@ virshDomainNameCompleter(vshControl *ctl,
+ 
+ virCheckFlags(VIR_CONNECT_LIST_DOMAINS_ACTIVE |
+   VIR_CONNECT_LIST_DOMAINS_INACTIVE |
++  VIR_CONNECT_LIST_DOMAINS_OTHER |
++  VIR_CONNECT_LIST_DOMAINS_PAUSED |
+   VIR_CONNECT_LIST_DOMAINS_PERSISTENT |
+-  VIR_CONNECT_LIST_DOMAINS_TRANSIENT |
+   VIR_CONNECT_LIST_DOMAINS_RUNNING |
+-  VIR_CONNECT_LIST_DOMAINS_PAUSED |
+-  VIR_CONNECT_LIST_DOMAINS_SHUTOFF |
+-  VIR_CONNECT_LIST_DOMAINS_OTHER |
+-  VIR_CONNECT_LIST_DOMAINS_MANAGEDSAVE |
+-  VIR_CONNECT_LIST_DOMAINS_NO_MANAGEDSAVE |
+-  VIR_CONNECT_LIST_DOMAINS_AUTOSTART |
+-  VIR_CONNECT_LIST_DOMAINS_NO_AUTOSTART |
+-  VIR_CONNECT_LIST_DOMAINS_HAS_SNAPSHOT |
+-  VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT,
++  VIR_CONNECT_LIST_DOMAINS_SHUTOFF,
+   NULL);
+ 
+ if (!priv->conn || virConnectIsAlive(priv->conn) <= 0)
+diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
+index 0f329d6d7..5a0e0c1b2 100644
+--- a/tools/virsh-domain.c
 b/tools/virsh-domain.c
+@@ -1037,7 +1037,7 @@ static const vshCmdInfo info_autostart[] = {
+ };
+ 
+ static const vshCmdOptDef opts_autostart[] = {
+-VIRSH_COMMON_OPT_DOMAIN_FULL(0),
++VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_PERSISTENT),
+ {.name = "disable",
+  .type = VSH_OT_BOOL,
+  .help = N_("disable autostarting")

diff --git a/app-emulation/libvirt/libvirt-4.0.0.ebuild 
b/app-emulation/libvirt/libvirt-4.0.0.ebuild
index 487691cdac3..1107c986520 100644
--- a/app-emulation/libvirt/libvirt-4.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-4.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
+inherit autotools eutils user linux-info systemd readme.gentoo-r1 
bash-completion-r1
 
 if [[ ${PV} = ** ]]; then
inherit git-r3
@@ -127,6 +127,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
"${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch  # bug #609488
+   "${FILESDIR}"/${PN}-4.0.0-bash_completion_bugfixes.patch   # bug #644632
 )
 
 pkg_setup() {
@@ -358,6 +359,9 @@ src_install() {
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
 
+   newbashcomp "${S}/tools/bash-completion/vsh" vsh
+   bashcomp_alias vsh virsh virt-admin
+
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
DISABLE_AUTOFORMATTING=true
readme.gentoo_create_doc

diff --git a/app-emulation/libvirt/libvirt-.ebuild 
b/app-emulation/libvirt/libvirt-.ebuild
index 3716e896837..84ae6b580a7 100644
--- a/app-emulation/libvirt/libvirt-.ebuild
+++ b/app-emulation/libvirt/libvirt-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
+inherit autotools eutils user linux-info systemd readme.gentoo-r1 
bash-completion-r1
 
 if [[ ${PV} = ** ]]; then
inherit git-r3
@@ -355,6 +355,9 @@ src_install() {
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
newconfd 

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

[Matthias Maier]

commit: 4d0b860f0afb2132cf1c8bef635e2a4f5e6e17fa
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Jan 30 17:31:42 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:54:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d0b860f

dev-python/libvirt-python: version bump to 4.0.0

Package-Manager: Portage-2.3.20, Repoman-2.3.6

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

diff --git a/dev-python/libvirt-python/Manifest 
b/dev-python/libvirt-python/Manifest
index d5d8f73685f..38ee8590036 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,2 +1,3 @@
 DIST libvirt-python-3.10.0.tar.gz 184402 BLAKE2B 
f3ae1626dc6fe2afc2eb7754f6872a6696389bc13a3e8f557c6487e83e3ef66104251910fb4841a2f8b1667cec0418b87ad5a7e9ababf76a39a0f4adaec23bc4
 SHA512 
bbab01d43b1d9e682c5590c1ea1454c8891f2c545b49f48220f4e79ec4b5b01ab1736242a96653256e26fdf644389c4021747117978a9ec4e1084001de9f23f9
 DIST libvirt-python-3.8.0.tar.gz 184346 BLAKE2B 
453051621c0e43eb73e0734a2a2651357f363c4f61c1cd6b883841a55e6c2338721b3e116e841a47386e12c8bdb1d36aecf9b8948876256ed5396584a555
 SHA512 
40fcc67bf793b298016171751f207d65d98c8fe3e04d72bf4a815aab3c2f91a624fde1e0f1a420a67f4cf330874d7dd91ae46c3118e75067030ee551957a8178
+DIST libvirt-python-4.0.0.tar.gz 185533 BLAKE2B 
3f9e3483265b18025bbfc0955c2b0b8276448c41e2d85a49ebc2d42f8dcd77af25a0a11ba04fbe02dba282a946ac3f583866c5d9fcda0d56e7a5f20dc63e7f94
 SHA512 
3eca33bb04265323ad47a6c8cb04a6848ab2b06bf656a188c7c0a39419e6dcc5c21f16682f6c64647da432c1d7e3ddc4699d848766987baccf806d68b5937d9a

diff --git a/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild 
b/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
new file mode 100644
index 000..172f3dc3886
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-4.0.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1
+
+if [[ ${PV} = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
+   SRC_URI=""
+   KEYWORDS=""
+   RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+   SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz;
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org;
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="examples test"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   test? ( dev-python/lxml[${PYTHON_USEDEP}]
+   dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+   esetup.py test
+}
+
+python_install_all() {
+   if use examples; then
+   dodoc -r examples
+   docompress -x /usr/share/doc/${PF}/examples
+   fi
+   distutils-r1_python_install_all
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Zac Medico]

commit: 4325fc18ea8ba3c6a5c03d66725f9abc6ed8ac15
Author: Zac Medico  gentoo  org>
AuthorDate: Tue Jan 30 17:42:28 2018 +
Commit: Zac Medico  gentoo  org>
CommitDate: Tue Jan 30 17:52:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4325fc18

sys-apps/portage: require gemato[gpg] (bug 646134)

Reported-by: Daniel Kenzelmann  k8n.de>
Closes: https://bugs.gentoo.org/646134
Package-Manager: Portage-2.3.21, Repoman-2.3.6

 sys-apps/portage/portage-2.3.21.ebuild | 2 +-
 sys-apps/portage/portage-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/portage/portage-2.3.21.ebuild 
b/sys-apps/portage/portage-2.3.21.ebuild
index 4bd08154f1c..3bae3f2e389 100644
--- a/sys-apps/portage/portage-2.3.21.ebuild
+++ b/sys-apps/portage/portage-2.3.21.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
>=app-misc/pax-utils-0.1.17
rsync-verify? (
-   >=app-portage/gemato-10
+   >=app-portage/gemato-10[gpg,-portage-postsync(-)]
app-crypt/gentoo-keys
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

diff --git a/sys-apps/portage/portage-.ebuild 
b/sys-apps/portage/portage-.ebuild
index 98724289cf7..b774af20681 100644
--- a/sys-apps/portage/portage-.ebuild
+++ b/sys-apps/portage/portage-.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
>=app-misc/pax-utils-0.1.17
rsync-verify? (
-   >=app-portage/gemato-10
+   >=app-portage/gemato-10[gpg,-portage-postsync(-)]
app-crypt/gentoo-keys
)
selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )

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

[Kristian Fiskerstrand]

commit: d69e4f3df3d6b2cc38225659cdab39d724f1
Author: Kristian Fiskerstrand  gentoo  org>
AuthorDate: Tue Jan 30 17:42:30 2018 +
Commit: Kristian Fiskerstrand  gentoo  org>
CommitDate: Tue Jan 30 17:42:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69e4f3d

app-crypt/gnupg: Use ssl instead of gnutls USE flag

Closes: https://bugs.gentoo.org/646130
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-crypt/gnupg/gnupg-2.2.4-r1.ebuild | 129 ++
 1 file changed, 129 insertions(+)

diff --git a/app-crypt/gnupg/gnupg-2.2.4-r1.ebuild 
b/app-crypt/gnupg/gnupg-2.2.4-r1.ebuild
new file mode 100644
index 000..90eea8ab852
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.4-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/;
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb 
wks-server"
+
+COMMON_DEPEND_LIBS="
+   >=dev-libs/npth-1.2
+   >=dev-libs/libassuan-2.5.0
+   >=dev-libs/libgcrypt-1.7.3
+   >=dev-libs/libgpg-error-1.24
+   >=dev-libs/libksba-1.3.4
+   >=net-misc/curl-7.10
+   ssl? ( >=net-libs/gnutls-3.0:0= )
+   sys-libs/zlib
+   ldap? ( net-nds/openldap )
+   bzip2? ( app-arch/bzip2 )
+   readline? ( sys-libs/readline:0= )
+   smartcard? ( usb? ( virtual/libusb:0 ) )
+   tofu? ( >=dev-db/sqlite-3.7 )
+   "
+COMMON_DEPEND_BINS="app-crypt/pinentry
+   !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+   ${COMMON_DEPEND_BINS}
+   nls? ( sys-devel/gettext )
+   doc? ( sys-apps/texinfo )"
+
+RDEPEND="${COMMON_DEPEND_LIBS}
+   ${COMMON_DEPEND_BINS}
+   selinux? ( sec-policy/selinux-gpg )
+   nls? ( virtual/libintl )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+   ChangeLog NEWS README THANKS TODO VERSION
+   doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+   
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_configure() {
+   local myconf=()
+
+   if use smartcard; then
+   myconf+=(
+   --enable-scdaemon
+   $(use_enable usb ccid-driver)
+   )
+   else
+   myconf+=( --disable-scdaemon )
+   fi
+
+   if use elibc_SunOS || use elibc_AIX; then
+   myconf+=( --disable-symcryptrun )
+   else
+   myconf+=( --enable-symcryptrun )
+   fi
+
+   # glib fails and picks up clang's internal stdint.h causing weird errors
+   [[ ${CC} == *clang ]] && \
+   export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+   econf \
+   "${myconf[@]}" \
+   $(use_enable bzip2) \
+   $(use_enable ssl gnutls) \
+   $(use_enable nls) \
+   $(use_enable tofu) \
+   $(use_enable wks-server wks-tools) \
+   $(use_with ldap) \
+   $(use_with readline) \
+   --enable-gpg \
+   --enable-gpgsm \
+   --enable-large-secmem \
+   --enable-all-tests \
+   CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+   default
+
+   use doc && emake -C doc html
+}
+
+src_test() {
+   #Bug: 638574
+   use tofu && export TESTFLAGS=--parallel
+   default
+}
+
+src_install() {
+   default
+
+   use tools &&
+   dobin \
+   tools/{convert-from-106,gpg-check-pattern} \
+   
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+   tools/make-dns-cert
+
+   dosym gpg /usr/bin/gpg2
+   dosym gpgv /usr/bin/gpgv2
+   echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+   echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+   dodir /etc/env.d
+   echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> 
"${ED}"/etc/env.d/30gnupg || die
+
+   use doc && dodoc doc/gnupg.html/* doc/*.png
+
+   systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}

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

[Johannes Huber]

commit: afe71963c98ae10929e00b7ad4c2e1b9954dd85e
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue Jan 30 17:29:53 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Jan 30 17:29:53 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=afe71963

.travis.yml: Bump portage version to 2.3.21

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4176e71769..8f593e1e3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ language: python
 python:
 - pypy
 env:
-- PORTAGE_VER="2.3.20"
+- PORTAGE_VER="2.3.21"
 before_install:
 - sudo apt-get -qq update
 - pip install lxml

[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/

[Matthias Maier]

commit: c2ed1c8684ce24e9be429594b8562b3ac256fde3
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Jan 30 17:06:11 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:06:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ed1c86

app-emulation/libvirt: drop obsolete

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 .../libvirt-3.10.0-fix_paths_for_apparmor.patch| 118 ---
 app-emulation/libvirt/libvirt-3.10.0-r1.ebuild | 382 -
 2 files changed, 500 deletions(-)

diff --git 
a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch 
b/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch
deleted file mode 100644
index 0e386c1e00b..000
--- a/app-emulation/libvirt/files/libvirt-3.10.0-fix_paths_for_apparmor.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index ef2f79d..d8cdb9b 100644
 a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -23,7 +23,7 @@ EXTRA_DIST = \
-   apparmor/TEMPLATE.lxc \
-   apparmor/libvirt-qemu \
-   apparmor/libvirt-lxc \
--  apparmor/usr.lib.libvirt.virt-aa-helper \
-+  apparmor/usr.libexec.virt-aa-helper \
-   apparmor/usr.sbin.libvirtd \
-   lxcconvert/virt-lxc-convert \
-   polkit/libvirt-acl.rules \
-@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c
- if WITH_APPARMOR_PROFILES
- apparmordir = $(sysconfdir)/apparmor.d/
- apparmor_DATA = \
--  apparmor/usr.lib.libvirt.virt-aa-helper \
-+  apparmor/usr.libexec.virt-aa-helper \
-   apparmor/usr.sbin.libvirtd \
-   $(NULL)
- 
-diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
-index d4fad85..0b22009 100644
 a/examples/apparmor/libvirt-qemu
-+++ b/examples/apparmor/libvirt-qemu
-@@ -86,6 +86,8 @@
-   /usr/share/AAVMF/** r,
-   /usr/share/qemu-efi/** r,
-   /usr/share/slof/** r,
-+  /usr/share/seavgabios/** r,
-+  /usr/share/edk2-ovmf/** r,
- 
-   # access PKI infrastructure
-   /etc/pki/libvirt-vnc/** r,
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper 
b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-deleted file mode 100644
-index bd6181d..000
 a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ /dev/null
-@@ -1,60 +0,0 @@
--# Last Modified: Mon Apr  5 15:10:27 2010
--#include 
--
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
--  #include 
--
--  # needed for searching directories
--  capability dac_override,
--  capability dac_read_search,
--
--  # needed for when disk is on a network filesystem
--  network inet,
--  network inet6,
--
--  deny @{PROC}/[0-9]*/mounts r,
--  @{PROC}/[0-9]*/net/psched r,
--  owner @{PROC}/[0-9]*/status r,
--  @{PROC}/filesystems r,
--
--  /etc/libnl-3/classid r,
--
--  # for hostdev
--  /sys/devices/ r,
--  /sys/devices/** r,
--  deny /dev/sd* r,
--  deny /dev/vd* r,
--  deny /dev/dm-* r,
--  deny /dev/drbd[0-9]* r,
--  deny /dev/dasd* r,
--  deny /dev/nvme* r,
--  deny /dev/zd[0-9]* r,
--  deny /dev/mapper/ r,
--  deny /dev/mapper/* r,
--
--  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
--  /{usr/,}sbin/apparmor_parser Ux,
--
--  /etc/apparmor.d/libvirt/* r,
--  
/etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*
 rw,
--
--  # for backingstore -- allow access to non-hidden files in @{HOME} as well
--  # as storage pools
--  audit deny @{HOME}/.* mrwkl,
--  audit deny @{HOME}/.*/ rw,
--  audit deny @{HOME}/.*/** mrwkl,
--  audit deny @{HOME}/bin/ rw,
--  audit deny @{HOME}/bin/** mrwkl,
--  @{HOME}/ r,
--  @{HOME}/** r,
--  /var/lib/libvirt/images/ r,
--  /var/lib/libvirt/images/** r,
--  /{media,mnt,opt,srv}/** r,
--
--  /**.img r,
--  /**.qcow{,2} r,
--  /**.qed r,
--  /**.vmdk r,
--  /**.[iI][sS][oO] r,
--  /**/disk{,.*} r,
--}
-diff --git a/examples/apparmor/usr.sbin.libvirtd 
b/examples/apparmor/usr.sbin.libvirtd
-index 8d61d15..656a559 100644
 a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -84,8 +84,10 @@
-   audit deny /sys/kernel/security/apparmor/.* rwxl,
-   /sys/kernel/security/apparmor/profiles r,
-   /usr/{lib,lib64}/libvirt/* PUxr,
--  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
--  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
-+  /usr/libexec/virt-aa-helper PUxr,
-+  /usr/libexec/libvirt_lxc PUxr,
-+  /usr/libexec/libvirt_parthelper ix,
-+  /usr/libexec/libvirt_iohelper ix,
-   /etc/libvirt/hooks/** rmix,
-   /etc/xen/scripts/** rmix,
- 

diff --git a/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild 
b/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild
deleted file mode 100644
index cfdcbb6c994..000
--- a/app-emulation/libvirt/libvirt-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = 

[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/files/, app-emulation/libvirt/

[Matthias Maier]

commit: 002a0f6216825de8c045768a5baeeaf862339497
Author: aporilel <35788283+aporilel  users  noreply  github 
 com>
AuthorDate: Thu Jan 25 02:23:36 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:03:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002a0f62

app-emulation/libvirt: fix apparmor patch

Fixes: 24cd72c425327c6 ("app-emulation/libvirt: Update apparmor profiles")
Closes: https://bugs.gentoo.org/629718
Closes: https://github.com/gentoo/gentoo/pull/6954

Signed-off-by: Matthias Maier  gentoo.org>

 .../libvirt-3.10.0-r2-fix_paths_for_apparmor.patch |  77 +
 app-emulation/libvirt/libvirt-3.10.0-r2.ebuild | 382 +
 2 files changed, 459 insertions(+)

diff --git 
a/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch 
b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch
new file mode 100644
index 000..f1360ae4e4e
--- /dev/null
+++ b/app-emulation/libvirt/files/libvirt-3.10.0-r2-fix_paths_for_apparmor.patch
@@ -0,0 +1,77 @@
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index ef2f79db3..d8cdb9b3f 100644
+--- a/examples/Makefile.am
 b/examples/Makefile.am
+@@ -23,7 +23,7 @@ EXTRA_DIST = \
+   apparmor/TEMPLATE.lxc \
+   apparmor/libvirt-qemu \
+   apparmor/libvirt-lxc \
+-  apparmor/usr.lib.libvirt.virt-aa-helper \
++  apparmor/usr.libexec.virt-aa-helper \
+   apparmor/usr.sbin.libvirtd \
+   lxcconvert/virt-lxc-convert \
+   polkit/libvirt-acl.rules \
+@@ -70,7 +70,7 @@ admin_logging_SOURCES = admin/logging.c
+ if WITH_APPARMOR_PROFILES
+ apparmordir = $(sysconfdir)/apparmor.d/
+ apparmor_DATA = \
+-  apparmor/usr.lib.libvirt.virt-aa-helper \
++  apparmor/usr.libexec.virt-aa-helper \
+   apparmor/usr.sbin.libvirtd \
+   $(NULL)
+ 
+diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu
+index d4fad85a1..0b22009e5 100644
+--- a/examples/apparmor/libvirt-qemu
 b/examples/apparmor/libvirt-qemu
+@@ -86,6 +86,8 @@
+   /usr/share/AAVMF/** r,
+   /usr/share/qemu-efi/** r,
+   /usr/share/slof/** r,
++  /usr/share/seavgabios/** r,
++  /usr/share/edk2-ovmf/** r,
+ 
+   # access PKI infrastructure
+   /etc/pki/libvirt-vnc/** r,
+diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper 
b/examples/apparmor/usr.libexec.virt-aa-helper
+similarity index 92%
+rename from examples/apparmor/usr.lib.libvirt.virt-aa-helper
+rename to examples/apparmor/usr.libexec.virt-aa-helper
+index bd6181d00..4086f140a 100644
+--- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
 b/examples/apparmor/usr.libexec.virt-aa-helper
+@@ -1,7 +1,7 @@
+ # Last Modified: Mon Apr  5 15:10:27 2010
+ #include 
+ 
+-profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
++profile virt-aa-helper /usr/libexec/virt-aa-helper {
+   #include 
+ 
+   # needed for searching directories
+@@ -32,7 +32,7 @@ profile virt-aa-helper 
/usr/{lib,lib64}/libvirt/virt-aa-helper {
+   deny /dev/mapper/ r,
+   deny /dev/mapper/* r,
+ 
+-  /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
++  /usr/libexec/virt-aa-helper mr,
+   /{usr/,}sbin/apparmor_parser Ux,
+ 
+   /etc/apparmor.d/libvirt/* r,
+diff --git a/examples/apparmor/usr.sbin.libvirtd 
b/examples/apparmor/usr.sbin.libvirtd
+index 8d61d154e..656a5595b 100644
+--- a/examples/apparmor/usr.sbin.libvirtd
 b/examples/apparmor/usr.sbin.libvirtd
+@@ -84,8 +84,10 @@
+   audit deny /sys/kernel/security/apparmor/.* rwxl,
+   /sys/kernel/security/apparmor/profiles r,
+   /usr/{lib,lib64}/libvirt/* PUxr,
+-  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
+-  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
++  /usr/libexec/virt-aa-helper PUxr,
++  /usr/libexec/libvirt_lxc PUxr,
++  /usr/libexec/libvirt_parthelper ix,
++  /usr/libexec/libvirt_iohelper ix,
+   /etc/libvirt/hooks/** rmix,
+   /etc/xen/scripts/** rmix,
+ 

diff --git a/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild 
b/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild
new file mode 100644
index 000..e918ac7a33e
--- /dev/null
+++ b/app-emulation/libvirt/libvirt-3.10.0-r2.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils user linux-info systemd readme.gentoo-r1
+
+if [[ ${PV} = ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="git://libvirt.org/libvirt.git"
+   SRC_URI=""
+   KEYWORDS=""
+   SLOT="0"
+else
+   # Versions with 4 numbers are stable updates:
+   if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
+   SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz;
+   else
+   SRC_URI="http://libvirt.org/sources/${P}.tar.xz;
+   fi
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/;
+LICENSE="LGPL-2.1"
+IUSE="
+  

[gentoo-commits] repo/gentoo:master commit in: app-emulation/lxc/, app-emulation/lxc/files/

[Matthias Maier]

commit: dd450253467dd8d704a398d794d1a704cac81ecc
Author: i.Dark_Templar  dark-templar-archives  net>
AuthorDate: Sun Nov  5 08:50:03 2017 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:00:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd450253

app-emulation/lxc: bump to version 2.1.1.

[tamiko: regenerate metadata to make remote hook happy]

Closes: https://bugs.gentoo.org/636572
Closes: https://github.com/gentoo/gentoo/pull/6128
Signed-off-by: Matthias Maier  gentoo.org>

 app-emulation/lxc/Manifest |   1 +
 ...ps-enable-container-without-CAP_SYS_ADMIN.patch | 164 +
 .../files/lxc-2.1.1-fix-cgroup2-detection.patch|  26 +++
 app-emulation/lxc/files/lxc.initd.7| 124 +
 app-emulation/lxc/lxc-2.1.1.ebuild | 201 +
 5 files changed, 516 insertions(+)

diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index c9008c2d3c8..5c6a4ead6f8 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -2,3 +2,4 @@ DIST lxc-1.0.11.tar.gz 850645 BLAKE2B 
1a8eff91d970d3160d5ca7338f4e4d68c722a277a8
 DIST lxc-1.0.8.tar.gz 575127 BLAKE2B 
246ac7a2b4306c52a741b2f763bcc81dfb27942ef93d6a786ed2ea010c646f5a2388407d26425387b8a819cacae927c8512995bf19b11d610e1887ea6470
 SHA512 
f552a4f48bb47d26c6b9ddaf8221a439c0848e3f54ec41b77d54717c21bddd56193941046cc96c699790e8265e762a926469c25ee687adcf7795f2906b1c260a
 DIST lxc-2.0.7.tar.gz 792557 BLAKE2B 
e5f1e6d8961938200e116527fab8ce341cf285826afdccac88f4bae65ffd649a406dac7555024557f38c4b415a59cd3b5fb255f1dbf015ce01d4975bed3b1c80
 SHA512 
eb48dc800ce43d2f4d46e0cecc4d0a714b3e22c6a4975776b54d17d1d20d5a1411e6b605215282f1f77286ddf22b61c80b86b83752191fc18023894ef7a1c44d
 DIST lxc-2.0.9.tar.gz 1333044 BLAKE2B 
44d405bf933923a020a6aadca9d84cfce04db72ac0ef1a727c83eca8121683419a2e74849f08fb4773010002928b424840fa9ec19ab619e420b1dfb5156de5c6
 SHA512 
c7c595fbc6163e500700b756ae30c96b70d41b9bf297a609622b5d5b8431171ed8db70fa8368c3b9650c86452820e9da7f329f9186ae75c24a7adb15d5826102
+DIST lxc-2.1.1.tar.gz 1378640 BLAKE2B 
5fca516540a886729434579ff99acf3baa06977fa0e0b6f24dbf15094626335fc073597d308276e3dd20e27ceabf1477cc8e99d1fd24cf50b9aed2720b887b69
 SHA512 
2989d57acddfe091adcf8031721c3c9a2f8eff5476bd6155366b76ea7511e0f6120e669276e056e3963863e0f0acf3b095d44c36fa6652e67c197671f28cbdd4

diff --git 
a/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
 
b/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
new file mode 100644
index 000..8493491d0d6
--- /dev/null
+++ 
b/app-emulation/lxc/files/lxc-2.1.1-cgroups-enable-container-without-CAP_SYS_ADMIN.patch
@@ -0,0 +1,164 @@
+From b635e92d21d2a4d71a553388f18cfa08f44bf1ba Mon Sep 17 00:00:00 2001
+From: Christian Brauner 
+Date: Mon, 30 Oct 2017 14:16:46 +0100
+Subject: [PATCH] cgroups: enable container without CAP_SYS_ADMIN
+
+In case cgroup namespaces are supported but we do not have CAP_SYS_ADMIN we
+need to mount cgroups for the container. This patch enables both privileged and
+unprivileged containers without CAP_SYS_ADMIN.
+
+Closes #1737.
+
+Signed-off-by: Christian Brauner 
+---
+ src/lxc/cgroups/cgfs.c   |  3 ++-
+ src/lxc/cgroups/cgfsng.c | 52 +---
+ src/lxc/cgroups/cgroup.c |  2 +-
+ src/lxc/conf.c   |  3 ---
+ src/lxc/conf.h   |  1 +
+ 5 files changed, 53 insertions(+), 8 deletions(-)
+
+diff --git a/src/lxc/cgroups/cgfs.c b/src/lxc/cgroups/cgfs.c
+index bcbd6613..efd627f0 100644
+--- a/src/lxc/cgroups/cgfs.c
 b/src/lxc/cgroups/cgfs.c
+@@ -1418,11 +1418,12 @@ static bool cgroupfs_mount_cgroup(void *hdata, const 
char *root, int type)
+   struct cgfs_data *cgfs_d;
+   struct cgroup_process_info *info, *base_info;
+   int r, saved_errno = 0;
++  struct lxc_handler *handler = hdata;
+ 
+   if (cgns_supported())
+   return true;
+ 
+-  cgfs_d = hdata;
++  cgfs_d = handler->cgroup_data;
+   if (!cgfs_d)
+   return false;
+   base_info = cgfs_d->info;
+diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
+index e43edd7d..ec6440c1 100644
+--- a/src/lxc/cgroups/cgfsng.c
 b/src/lxc/cgroups/cgfsng.c
+@@ -50,6 +50,7 @@
+ #include 
+ #include 
+ 
++#include "caps.h"
+ #include "cgroup.h"
+ #include "cgroup_utils.h"
+ #include "commands.h"
+@@ -1616,17 +1617,49 @@ do_secondstage_mounts_if_needed(int type, struct 
hierarchy *h,
+   return 0;
+ }
+ 
++static int mount_cgroup_cgns_supported(struct hierarchy *h, const char 
*controllerpath)
++{
++   int ret;
++   char *controllers = NULL;
++   char *type = "cgroup2";
++
++  if (!h->is_cgroup_v2) {
++  controllers = lxc_string_join(",", (const char 
**)h->controllers, false);
++  if (!controllers)

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

[Matthias Maier]

commit: 578b9b6fa8d819496ffdb0df4224a7e2e65a28c4
Author: Matthias Maier  gentoo  org>
AuthorDate: Tue Jan 30 16:49:59 2018 +
Commit: Matthias Maier  gentoo  org>
CommitDate: Tue Jan 30 17:00:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578b9b6f

app-emulation/lxc: update 2.1.1 ebuild to latest changes in 2.0.9

 - build man pages unconditionally
 - python support
 - regenerate metadata
 - selinux support
 - use readme eclass

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 app-emulation/lxc/lxc-2.1.1.ebuild | 65 +++---
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/app-emulation/lxc/lxc-2.1.1.ebuild 
b/app-emulation/lxc/lxc-2.1.1.ebuild
index 7ddad1b7527..304701cf005 100644
--- a/app-emulation/lxc/lxc-2.1.1.ebuild
+++ b/app-emulation/lxc/lxc-2.1.1.ebuild
@@ -1,36 +1,36 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator 
flag-o-matic systemd
-
+inherit autotools bash-completion-r1 distutils-r1 linux-info versionator 
flag-o-matic systemd readme.gentoo-r1
 DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/;
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz;
 
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="cgmanager doc examples lua python seccomp"
+IUSE="cgmanager examples lua python seccomp selinux"
 
-RDEPEND="net-libs/gnutls
+RDEPEND="
+   net-libs/gnutls
sys-libs/libcap
cgmanager? ( app-admin/cgmanager )
lua? ( >=dev-lang/lua-5.1:= )
python? ( ${PYTHON_DEPS} )
-   seccomp? ( sys-libs/libseccomp )"
+   seccomp? ( sys-libs/libseccomp )
+   selinux? ( sys-libs/libselinux )"
 
 DEPEND="${RDEPEND}
-   doc? ( app-text/docbook-sgml-utils )
+   app-text/docbook-sgml-utils
>=sys-kernel/linux-headers-3.2"
 
 RDEPEND="${RDEPEND}
-   sys-process/criu
sys-apps/util-linux
app-misc/pax-utils
virtual/awk"
@@ -123,6 +123,9 @@ src_configure() {
# /var/lib/lxc is probably more appropriate than
# /usr/lib/lxc.
# Note by holgersson: Why is apparmor disabled?
+
+   # --enable-doc is for manpages which is why we don't link it to a "doc"
+   # USE flag. We always want man pages.
econf \
--localstatedir=/var \
--bindir=/usr/bin \
@@ -133,12 +136,13 @@ src_configure() {
--with-runtime-path=/run \
--disable-apparmor \
--disable-werror \
+   --enable-doc \
$(use_enable cgmanager) \
-   $(use_enable doc) \
$(use_enable examples) \
$(use_enable lua) \
$(use_enable python) \
-   $(use_enable seccomp)
+   $(use_enable seccomp) \
+   $(use_enable selinux)
 }
 
 python_compile() {
@@ -182,20 +186,29 @@ src_install() {
# Remember to compare our systemd unit file with the upstream one
# config/init/systemd/lxc.service.in
systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+
+   DOC_CONTENTS="
+   Starting from version ${PN}-1.1.0-r3, the default lxc path has been
+   moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc
+   please add the following to your /etc/lxc/lxc.conf
+
+ lxc.lxcpath = /etc/lxc
+
+   For openrc, there is an init script provided with the package.
+   You _should_ only need to symlink /etc/init.d/lxc to
+   /etc/init.d/lxc.configname to start the container defined in
+   /etc/lxc/configname.conf.
+
+   Correspondingly, for systemd a service file lxc@.service is installed.
+   Enable and start lxc@configname in order to start the container defined
+   in /etc/lxc/configname.conf.
+
+   If you want checkpoint/restore functionality, please install criu
+   (sys-process/criu)."
+   DISABLE_AUTOFORMATTING=true
+   readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-   elog ""
-   elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has 
been"
-   elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use 
/etc/lxc"
-   elog "please add the following to your /etc/lxc/default.conf"
-   elog "lxc.lxcpath = /etc/lxc"
-   elog ""
-   elog "There is an init script provided with the package now; no 
documentation"
-   elog "is currently available though, so please check out 
/etc/init.d/lxc ."
-   elog "You _should_ only need to symlink it to 
/etc/init.d/lxc.configname"
-   elog "to start the container defined into 

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

[Lars Wendler]

commit: 0d0236137bf6f58566671690f7bd4074e512320f
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan 30 16:04:07 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan 30 16:04:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d023613

dev-libs/libevdev: Bump to version 1.5.8

Package-Manager: Portage-2.3.21, Repoman-2.3.6

 dev-libs/libevdev/Manifest  |  1 +
 dev-libs/libevdev/libevdev-1.5.8.ebuild | 25 +
 2 files changed, 26 insertions(+)

diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 8bc1bdeacc5..5520fc57ee4 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,2 +1,3 @@
 DIST libevdev-1.5.6.tar.xz 407024 BLAKE2B 
1475de52bf27b505fca1aee3d98426b68cd8a7e05c126c94c7824915a091ffcf2495686c4d0feed628fec73a5b5c7c8bf70e062f25c06dd28024ae11e75b2868
 SHA512 
4e9f44e0957d9d83e46de095f1eb8a64d7db808ac5a397d266ec1149948b82aa3f123fcf3d47cd72aff2741cce13b2162324c195f892861de97d7beb19ef6b19
 DIST libevdev-1.5.7.tar.xz 407452 BLAKE2B 
7558bee09dfa1bfe99483d32c99da6011b8234b3dd19084c9d88eb69aafbf221d6f51ee4f0f360225f2aed40b7ff49052256704dcb9e592947adee175a1f40b2
 SHA512 
53adf6c92ec61f0635b643a88d8762a18f7cd3088d23ac95831be32cc7150ebd19f20265b90f6a1f9a63420c2f8968c2d17d8dc4892c0e90f9dfcce82c622df1
+DIST libevdev-1.5.8.tar.xz 408132 BLAKE2B 
82f33affe2ac285861dc584f6e8dd6a79e4ed52820b3e16c330037b28cc5f070c55eecd9afc1b5ba34cfc88063d63c1cc8ec63e27b7380a123330eb5c5ed8b9c
 SHA512 
e9485d8c6b48ebf762b32b003bc6b761c548024ad3bc34a0793485b53383746881fcc9b206a078d571937291e519d9822e50c5d8816778d347094691b65ec3fa

diff --git a/dev-libs/libevdev/libevdev-1.5.8.ebuild 
b/dev-libs/libevdev/libevdev-1.5.8.ebuild
new file mode 100644
index 000..8b9f30261c7
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.5.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+XORG_MULTILIB=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-any-r1 xorg-2
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libevdev.git;
+
+DESCRIPTION="Handler library for evdev events"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/;
+
+if [[ ${PV} == * ]] ; then
+   SRC_URI=""
+else
+   SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz;
+fi
+
+RESTRICT="test" # Tests need to run as root.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc 
~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"

[gentoo-commits] proj/gnome:master commit in: dev-libs/json-glib/

[Sobhan Mohammadpour]

commit: 88cbc38575d33a5b5fe9ed98432375d7cb45f9a1
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Jan 30 15:34:36 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Jan 30 15:34:36 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=88cbc385

dev-libs/json-glib: version bump to 1.4.2

Package-Manager: Portage-2.3.21, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/json-glib/json-glib-1.4.2.ebuild | 46 +++
 dev-libs/json-glib/metadata.xml   | 15 ++
 2 files changed, 61 insertions(+)

diff --git a/dev-libs/json-glib/json-glib-1.4.2.ebuild 
b/dev-libs/json-glib/json-glib-1.4.2.ebuild
new file mode 100644
index ..781b862d
--- /dev/null
+++ b/dev-libs/json-glib/json-glib-1.4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome-meson multilib-minimal
+
+DESCRIPTION="Library providing GLib serialization and deserialization for the 
JSON format"
+HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib;
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +introspection"
+
+RDEPEND="
+   >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+   introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+   doc? (
+   ~app-text/docbook-xml-dtd-4.1.2
+   app-text/docbook-xsl-stylesheets
+   dev-libs/libxslt
+   dev-util/gtk-doc
+   )
+   >=sys-devel/gettext-0.18
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+multilib_src_configure() {
+   gnome-meson_src_configure \
+   -Ddocs=true \
+   $(meson_use introspection)
+}
+
+multilib_src_compile() {
+   gnome-meson_src_compile
+}
+
+multilib_src_test() {
+   meson_src_test
+}
+
+multilib_src_install() {
+   gnome-meson_src_install
+}

diff --git a/dev-libs/json-glib/metadata.xml b/dev-libs/json-glib/metadata.xml
new file mode 100644
index ..0aa1782a
--- /dev/null
+++ b/dev-libs/json-glib/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   voyag...@gentoo.org
+   Bernard Cafarelli
+   
+   
+   gn...@gentoo.org
+   Gentoo GNOME Desktop
+   
+   JSON-GLib is a library providing serialization and 
deserialization support for the JavaScript Object Notation (JSON) format 
described by RFC 4627. Many high-level languages already provide native modules 
for parsing, generating and manipulating JSON data streams. JSON-GLib is a C 
library based on GLib and released under the terms of the GNU Lesser General 
Public License version 2.1. It provides a parser and a generator GObject 
classes and various wrappers for the complex data types employed by JSON, such 
as arrays and objects.
+
+JSON-GLib uses GLib native data types and the generic value container GValue 
for ease of development. It also provides integration with the GObject classes 
for direct serialization into, and deserialization from, JSON data 
streams.
+

[gentoo-commits] proj/gnome:master commit in: sys-apps/baobab/

[Sobhan Mohammadpour]

commit: 336b154d7b6dae50febfd4b8576a9e3c7ab03cc8
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Jan 30 15:17:49 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Jan 30 15:17:49 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=336b154d

sys-apps/baobab: version bump to 3.26.1

Package-Manager: Portage-2.3.21, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 sys-apps/baobab/baobab-3.26.1.ebuild | 37 
 1 file changed, 37 insertions(+)

diff --git a/sys-apps/baobab/baobab-3.26.1.ebuild 
b/sys-apps/baobab/baobab-3.26.1.ebuild
new file mode 100644
index ..9a65cb60
--- /dev/null
+++ b/sys-apps/baobab/baobab-3.26.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab;
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd 
~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+   dev-lang/vala:0.38
+   >=dev-libs/glib-2.40:2[dbus]
+   >=x11-libs/gtk+-3.19.1:3
+"
+RDEPEND="${COMMON_DEPEND}
+   gnome-base/gsettings-desktop-schemas
+   x11-themes/adwaita-icon-theme
+   !

[gentoo-commits] proj/gnome:master commit in: dev-libs/vala-common/

[Sobhan Mohammadpour]

commit: a787682e8f886c28eebe1f25eacef8e1e32bf280
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Jan 30 15:12:54 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Jan 30 15:12:54 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a787682e

dev-libs/vala-common: version bump to 0.38.2

Package-Manager: Portage-2.3.21, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-libs/vala-common/metadata.xml  |  8 +++
 dev-libs/vala-common/vala-common-0.38.2.ebuild | 76 ++
 2 files changed, 84 insertions(+)

diff --git a/dev-libs/vala-common/metadata.xml 
b/dev-libs/vala-common/metadata.xml
new file mode 100644
index ..39980802
--- /dev/null
+++ b/dev-libs/vala-common/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+   gn...@gentoo.org
+   Gentoo GNOME Desktop
+
+

diff --git a/dev-libs/vala-common/vala-common-0.38.2.ebuild 
b/dev-libs/vala-common/vala-common-0.38.2.ebuild
new file mode 100644
index ..91475023
--- /dev/null
+++ b/dev-libs/vala-common/vala-common-0.38.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="vala"
+
+inherit gnome.org
+
+DESCRIPTION="Build infrastructure for packages that use Vala"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala;
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos 
~x64-solaris"
+IUSE=""
+
+# Previously ${PN} was part of dev-lang/vala
+RDEPEND="
+   ! /dev/null
+   eend $?
+   fi
+   if has_version ' /dev/null
+   eend $?
+   fi
+   if has_version ' /dev/null
+   eend $?
+   fi
+   if has_version ' /dev/null
+   eend $?
+   if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then
+   ebegin "Removing old vala-0.16 makefile template"
+   rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> 
/dev/null
+   eend $?
+   fi
+   fi
+   if has_version ' /dev/null
+   eend $?
+   if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then
+   ebegin "Removing old vala-0.18 makefile template"
+   rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> 
/dev/null
+   eend $?
+   fi
+   fi
+}

[gentoo-commits] proj/gnome:master commit in: dev-lang/vala/

[Sobhan Mohammadpour]

commit: c0fbcda282f57405dd3152b2147ddfa3cb3e2de0
Author: Sobhan Mohammadpour  gentoo  org>
AuthorDate: Tue Jan 30 15:15:49 2018 +
Commit: Sobhan Mohammadpour  gentoo  org>
CommitDate: Tue Jan 30 15:15:49 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=c0fbcda2

dev-lang/vala: version bump to 0.38.2

Package-Manager: Portage-2.3.21, Repoman-2.3.6
Manifest-Sign-Key: 0x7DF238CF0AA182E1

 dev-lang/vala/metadata.xml   |  8 
 dev-lang/vala/vala-0.38.2.ebuild | 41 
 2 files changed, 49 insertions(+)

diff --git a/dev-lang/vala/metadata.xml b/dev-lang/vala/metadata.xml
new file mode 100644
index ..5f429420
--- /dev/null
+++ b/dev-lang/vala/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+  
+  gn...@gentoo.org
+  Gentoo GNOME Desktop
+  
+

diff --git a/dev-lang/vala/vala-0.38.2.ebuild b/dev-lang/vala/vala-0.38.2.ebuild
new file mode 100644
index ..51b8f7d1
--- /dev/null
+++ b/dev-lang/vala/vala-0.38.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Compiler for the GObject type system"
+HOMEPAGE="https://wiki.gnome.org/Projects/Vala;
+
+LICENSE="LGPL-2.1"
+SLOT="0.38"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+   >=media-gfx/graphviz-2.16
+   >=dev-libs/glib-2.40:2
+   >=dev-libs/vala-common-${PV}
+"
+DEPEND="${RDEPEND}
+   !${CATEGORY}/${PN}:0
+   dev-libs/libxslt
+   sys-devel/flex
+   virtual/pkgconfig
+   virtual/yacc
+   test? (
+   dev-libs/dbus-glib
+   >=dev-libs/glib-2.26:2
+   dev-libs/gobject-introspection )
+"
+
+src_configure() {
+   # bug 483134
+   export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+
+   # weasyprint enables generation of PDF from HTML
+   gnome2_src_configure \
+   --disable-unversioned \
+   VALAC=: \
+   WEASYPRINT=:
+}

[gentoo-commits] repo/gentoo:master commit in: net-nntp/tin/

[José María Alonso]

commit: 30aad951282e981b515b1463ba441287e815d174
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Tue Jan 30 15:15:04 2018 +
Commit: José María Alonso  gentoo  org>
CommitDate: Tue Jan 30 15:15:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30aad951

net-nntp/tin: Bumps version to 2.4.2.

Cleans net-misc/urlview dependency (bug #646118)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-nntp/tin/Manifest |  1 +
 net-nntp/tin/tin-2.4.2.ebuild | 77 +++
 2 files changed, 78 insertions(+)

diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 227280686a9..23e38f46d03 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,3 +1,4 @@
 DIST tin-2.0.1.tar.bz2 1758848 BLAKE2B 
63a6302724c405114b3d692d7b283ca3ea297661055ada944b95a46d27a23a371f9d16929888c41b6e95a6e1a16b5bba964467ff57d26a1ba81a951a68c7ac2a
 SHA512 
fc2bd0586e72a2fb4f8a223c0ceeb19e2dfcdb300d463f0f5d4b7367346a032614aa662a4d9d11673269be59cbaeff39fa3fdf7618dd41e965850d137919a386
 DIST tin-2.2.1.tar.xz 1378384 BLAKE2B 
d68157e778f272c55cb3021987beddb27e89bd31d39e985b16e51a4aa942cb59abcc6ada46611c69320e785506085210a0451227091964866b4130e99c5f1ac5
 SHA512 
2c5b4b50be38c168404ba55c9429355c0dd2232c580116086fa9ea24a8907ad2d71d91b2d1c533bf7ff4d24fd1946d5ba61bc0833b20d5383e013e2f18c10bbd
 DIST tin-2.3.1.tar.xz 1381840 BLAKE2B 
c6ccf0b41b56acc5e3628b32eba62502e4f01e1f0db2936d8aebbfafb27a4cbc7fbd1664e4d646d8e3128ee4b7a17dbc55e7ea93b7eda68c1518b4303bcdaecd
 SHA512 
53fecc8fca7c67a7082a1f3f77a868433725a2ad4cc5650cdd522f791cbfc336733db5de3c637606788a2844df7e13e1d3fbae48c15ceaa49e24ea6e297926af
+DIST tin-2.4.2.tar.xz 1491388 BLAKE2B 
16fab433443d5859cc9661790ff837e8f45767e7f45bafc54a8cffc94fd52cb4ee7afb98e579db49c16148b0f521374404a0f26d75a07a24c1c7a1dc5e3a57fe
 SHA512 
70a9957d5bf5af1bb182a3f4e62795cd5862b7282b7fc0c231c3bd02d83950cdbdd502d8a2cc5eae20b29af584e4f794f03378742b47ed93fc5c61ac5bbb01b6

diff --git a/net-nntp/tin/tin-2.4.2.ebuild b/net-nntp/tin/tin-2.4.2.ebuild
new file mode 100644
index 000..1846e91b835
--- /dev/null
+++ b/net-nntp/tin/tin-2.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
+HOMEPAGE="http://www.tin.org/;
+SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 
spell unicode"
+
+RDEPEND="
+   dev-libs/libpcre
+   dev-libs/uulib
+   gpg? ( app-crypt/gnupg )
+   idn? ( net-dns/libidn )
+   mime? ( net-mail/metamail )
+   nls? ( sys-devel/gettext )
+   sasl? ( virtual/gsasl )
+   socks5? ( net-proxy/dante )
+   sys-libs/ncurses:0[unicode?]
+   unicode? ( dev-libs/icu:= )
+"
+
+DEPEND="
+   ${RDEPEND}
+   app-arch/xz-utils
+   virtual/pkgconfig
+"
+
+src_configure() {
+   local screen="ncurses"
+   use unicode && screen="ncursesw"
+
+   tc-export AR CC RANLIB
+
+   econf \
+   $(use_enable cancel-locks) \
+   $(use_enable debug) \
+   $(use_enable etiquette) \
+   $(use_enable gpg pgp-gpg) \
+   $(use_enable ipv6) \
+   $(use_enable nls) \
+   $(use_with mime metamail /usr) \
+   $(use_with socks5 socks) $(use_with socks5) \
+   $(use_with spell ispell /usr) \
+   --disable-mime-strict-charset \
+   --enable-echo \
+   --enable-nntp-only \
+   --enable-prototypes \
+   --with-coffee  \
+   
--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}"
 \
+   --with-pcre=/usr \
+   --with-screen=${screen}
+}
+
+#src_compile() {
+#  emake build
+#}
+
+src_install() {
+   default
+
+   # File collision?
+   rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
+
+   dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
+   use doc && dodoc doc/{*.sample,*.txt}
+
+   insinto /etc/tin
+   doins doc/tin.defaults
+}