diff options
39 files changed, 404 insertions, 60 deletions
diff --git a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild index b6e5428ed4cf..a9f43d926dfe 100644 --- a/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild +++ b/app-dicts/mecab-ipadic/mecab-ipadic-2.7.0.20070801.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN%-*}/${MY_P}.tar.gz" LICENSE="ipadic" SLOT="0" -KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="unicode" DEPEND="app-text/mecab[unicode=]" diff --git a/app-emacs/auctex/auctex-12.1.ebuild b/app-emacs/auctex/auctex-12.1.ebuild index 1b6155aa84d1..ad2a784723d2 100644 --- a/app-emacs/auctex/auctex-12.1.ebuild +++ b/app-emacs/auctex/auctex-12.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3+ FDL-1.3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" IUSE="preview-latex" DEPEND="virtual/latex-base diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild index d86358004cce..7e4cedf33335 100644 --- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild +++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz" LICENSE="GPL-3+ MIT SGMLUG" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc x86 ~x86-fbsd" +KEYWORDS="amd64 ~ia64 ~ppc x86 ~x86-fbsd" IUSE="doc" RDEPEND=" diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild index 240f68aa5a54..7e38af358bf0 100644 --- a/app-text/mecab/mecab-0.996-r1.ebuild +++ b/app-text/mecab/mecab-0.996-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -10,7 +10,7 @@ HOMEPAGE="https://taku910.github.io/mecab/" SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz" LICENSE="|| ( BSD LGPL-2.1 GPL-2 )" -KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" SLOT="0" IUSE="static-libs unicode" diff --git a/dev-db/mysql/mysql-5.7.23-r2.ebuild b/dev-db/mysql/mysql-5.7.23-r2.ebuild index 568f371f34a0..a14f8b795edc 100644 --- a/dev-db/mysql/mysql-5.7.23-r2.ebuild +++ b/dev-db/mysql/mysql-5.7.23-r2.ebuild @@ -34,7 +34,7 @@ RESTRICT="libressl? ( test )" REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )" -KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild index 5936e8a00286..3a86d17be96e 100644 --- a/dev-libs/libgit2/libgit2-0.26.8.ebuild +++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos" + KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos" fi DESCRIPTION="A linkable library for Git" diff --git a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild index 73b5668d73fc..427196174bc6 100644 --- a/dev-perl/Term-Table/Term-Table-0.8.0.ebuild +++ b/dev-perl/Term-Table/Term-Table-0.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ inherit perl-module eutils DESCRIPTION="Format a header and rows into a table" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild index 7d8c08b412fd..96763c540a9b 100644 --- a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild +++ b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.220.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Check for uncleaned imports" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 ~sparc x86" +KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test minimal" # r:Test::Builder -> Test-Simple diff --git a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild index ba42741d1c5d..624b5e611198 100644 --- a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild +++ b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Test strings and data structures and show differences if not ok" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" PERL_RM_FILES=( "t/boilerplate.t" diff --git a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild index b3476b118f58..12de30e43c01 100644 --- a/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild +++ b/dev-perl/Test-FailWarnings/Test-FailWarnings-0.8.0-r1.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Add test failures if warnings are caught" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" LICENSE="Apache-2.0" diff --git a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild index d5051280194f..5b9e83a9e5fc 100644 --- a/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild +++ b/dev-perl/Test-File-ShareDir/Test-File-ShareDir-1.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,7 +8,7 @@ inherit perl-module DESCRIPTION="Create a Fake ShareDir for your modules for testing." SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND="virtual/perl-Carp diff --git a/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild b/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild index e7e4fae95d98..141bd4b5c961 100644 --- a/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild +++ b/dev-perl/Test-Inter/Test-Inter-1.60.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Framework for more readable interactive test scripts" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND="virtual/perl-IO" diff --git a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild index 9e4aeccff560..8d5da6059711 100644 --- a/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild +++ b/dev-perl/Test-Memory-Cycle/Test-Memory-Cycle-1.60.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Check for memory leaks and circular memory references" SLOT="0" -KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild index 16cc9ddc76fc..7477d360c7f6 100644 --- a/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild +++ b/dev-perl/Test-MockRandom/Test-MockRandom-1.10.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Replaces random number generation with non-random number generation LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test minimal examples" RDEPEND=" diff --git a/dev-perl/Test-Most/Test-Most-0.350.0.ebuild b/dev-perl/Test-Most/Test-Most-0.350.0.ebuild index 0ae042058dd6..62fe59a05bfb 100644 --- a/dev-perl/Test-Most/Test-Most-0.350.0.ebuild +++ b/dev-perl/Test-Most/Test-Most-0.350.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Most commonly needed test functions and features" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild index e742b2f6e6ff..1d0a6b575375 100644 --- a/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild +++ b/dev-perl/Test-Needs/Test-Needs-0.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ inherit perl-module DESCRIPTION="Skip tests when modules not available" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND="" diff --git a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild index a9623cba7178..d11a0d88fb42 100644 --- a/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild +++ b/dev-perl/Test-Number-Delta/Test-Number-Delta-1.60.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ DESCRIPTION="Compare the difference between numbers against a given tolerance" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test minimal" RDEPEND=" diff --git a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild index d5d33e8bcfcd..f3251c93c794 100644 --- a/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild +++ b/dev-perl/Test-Pod-Coverage/Test-Pod-Coverage-1.100.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Check for pod coverage in your distribution" LICENSE="Artistic-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild b/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild index 968afd75d8e4..a02d98dc4fc9 100644 --- a/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild +++ b/dev-perl/Test-Pod/Test-Pod-1.510.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Check for POD errors in files" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild index 99ec9141e916..430e02fcb898 100644 --- a/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild +++ b/dev-perl/Test-RequiresInternet/Test-RequiresInternet-0.50.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Easily test network connectivity" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild index 3df46b3a014a..4e07f1c2debd 100644 --- a/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild +++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.350.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="fork test" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-TCP/Test-TCP-2.190.0-r1.ebuild b/dev-perl/Test-TCP/Test-TCP-2.190.0-r1.ebuild index e0879eda5bb3..69ed763c1d45 100644 --- a/dev-perl/Test-TCP/Test-TCP-2.190.0-r1.ebuild +++ b/dev-perl/Test-TCP/Test-TCP-2.190.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Testing TCP program" SLOT="0" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-Trap/Test-Trap-0.3.3.ebuild b/dev-perl/Test-Trap/Test-Trap-0.3.3.ebuild index 3a84a3e09cde..b36dd10e62d5 100644 --- a/dev-perl/Test-Trap/Test-Trap-0.3.3.ebuild +++ b/dev-perl/Test-Trap/Test-Trap-0.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Trap exit codes, exceptions, output, etc" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=" diff --git a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild index 14e49ff9db32..b56e64c620b9 100644 --- a/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild +++ b/dev-perl/Test-Warn/Test-Warn-0.320.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Perl extension to test methods for warnings" SLOT="0" -KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha ~amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" diff --git a/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild b/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild index f160f1182907..815d3a1d66d3 100644 --- a/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild +++ b/dev-perl/Test-Warnings/Test-Warnings-0.26.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION='Test for warnings and the lack of them' SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test suggested" # Test::Builder -> perl-Test-Simple diff --git a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild index 01d1a4c6fcb6..1da1d794a5fb 100644 --- a/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild +++ b/dev-perl/Text-Diff/Text-Diff-1.450.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Perform diffs on files and record sets" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND=" diff --git a/media-gfx/rawtherapee/rawtherapee-5.4.ebuild b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild index 02f58d5e2e52..0b50baaa01ce 100644 --- a/media-gfx/rawtherapee/rawtherapee-5.4.ebuild +++ b/media-gfx/rawtherapee/rawtherapee-5.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="openmp" diff --git a/net-misc/nx/nx-3.5.99.16.ebuild b/net-misc/nx/nx-3.5.99.16.ebuild index eb3831cbde7d..ac90bff91f82 100644 --- a/net-misc/nx/nx-3.5.99.16.ebuild +++ b/net-misc/nx/nx-3.5.99.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/nx-libs/nx-libs-${PV}-full.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" +KEYWORDS="amd64 ~ppc x86" IUSE="elibc_glibc" RDEPEND=" diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild index 4309d740919a..9912ac58712b 100644 --- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild +++ b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="ldap" COMMON_DEPEND="dev-qt/qtcore:5 diff --git a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild index c55cc66218e5..42f843d70c69 100644 --- a/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild +++ b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="+fuse postgres +sqlite" REQUIRED_USE="|| ( postgres sqlite )" diff --git a/sys-power/nut/files/NUT-Monitor-1.3-paths.patch b/sys-power/nut/files/NUT-Monitor-1.3-paths.patch new file mode 100644 index 000000000000..17bedaead727 --- /dev/null +++ b/sys-power/nut/files/NUT-Monitor-1.3-paths.patch @@ -0,0 +1,48 @@ +--- a/scripts/python/app/NUT-Monitor ++++ b/scripts/python/app/NUT-Monitor +@@ -70,7 +70,7 @@ + ( cmd_opts, args ) = opt_parser.parse_args() + + +- self.__glade_file = os.path.join( os.path.dirname( sys.argv[0] ), "gui-1.3.glade" ) ++ self.__glade_file = '/usr/share/nut/gui-1.3.glade' + + self.__widgets["interface"] = gtk.glade.XML( self.__glade_file, "window1", APP ) + self.__widgets["main_window"] = self.__widgets["interface"].get_widget("window1") +@@ -103,11 +103,11 @@ + + # Create the tray icon and connect it to the show/hide method... + self.__widgets["status_icon"] = gtk.StatusIcon() +- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) ) ++ self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" ) + self.__widgets["status_icon"].set_visible( True ) + self.__widgets["status_icon"].connect( "activate", self.tray_activated ) + +- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "on_line.png" ) ) ++ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/on_line.png" ) + + # Define interface callbacks actions + self.__callbacks = { "on_window1_destroy" : self.quit, +@@ -265,8 +265,8 @@ + #------------------------------------------------------------------- + # Change the status icon and tray icon + def change_status_icon( self, icon="on_line", blink=False ) : +- self.__widgets["status_icon"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) ) +- self.__widgets["ups_status_image"].set_from_file( os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "%s.png" % icon ) ) ++ self.__widgets["status_icon"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon ) ++ self.__widgets["ups_status_image"].set_from_file( "/usr/share/nut/pixmaps/%s.png" % icon ) + self.__widgets["status_icon"].set_blinking( blink ) + + #------------------------------------------------------------------- +@@ -719,9 +719,9 @@ + + for k,v in vars.iteritems() : + if ( rwvars.has_key( k ) ) : +- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-rw.png" ) ++ icon_file = "/usr/share/nut/pixmaps/var-rw.png" + else : +- icon_file = os.path.join( os.path.dirname( sys.argv[0] ), "pixmaps", "var-ro.png" ) ++ icon_file = "/usr/share/nut/pixmaps/var-ro.png" + + icon = gtk.gdk.pixbuf_new_from_file( icon_file ) + self.__widgets["ups_vars_tree_store"].append( [ icon, k, v ] ) diff --git a/sys-power/nut/files/nut-2.6.2-lowspeed-buffer-size.patch b/sys-power/nut/files/nut-2.6.2-lowspeed-buffer-size.patch index 9806d07e53ba..1e6617316fb9 100644 --- a/sys-power/nut/files/nut-2.6.2-lowspeed-buffer-size.patch +++ b/sys-power/nut/files/nut-2.6.2-lowspeed-buffer-size.patch @@ -3,10 +3,10 @@ http://boxster.ghz.cc/projects/nut/changeset/2407 Respun from nut-2.4.3-lowspeed-buffer-size.patch -Index: /trunk/drivers/libhid.c +Index: a/drivers/libhid.c =================================================================== ---- /trunk/drivers/libhid.c (revision 2336) -+++ /trunk/drivers/libhid.c (revision 2407) +--- a/drivers/libhid.c (revision 2336) ++++ a/drivers/libhid.c (revision 2407) @@ -142,5 +142,5 @@ int id = pData->ReportID; int r; diff --git a/sys-power/nut/files/nut-2.7.2/nut-2.7.2-no-libdummy.patch b/sys-power/nut/files/nut-2.7.2-no-libdummy.patch index ca0d8be028f5..ca0d8be028f5 100644 --- a/sys-power/nut/files/nut-2.7.2/nut-2.7.2-no-libdummy.patch +++ b/sys-power/nut/files/nut-2.7.2-no-libdummy.patch diff --git a/sys-power/nut/metadata.xml b/sys-power/nut/metadata.xml index d9ab89aeb368..85d0b12815ae 100644 --- a/sys-power/nut/metadata.xml +++ b/sys-power/nut/metadata.xml @@ -9,6 +9,7 @@ <email>prometheanfire@gentoo.org</email> </maintainer> <use> + <flag name="gui">Install NUT-Monitor python gui</flag> <flag name="ipmi">Support IPMI-based UPSes.</flag> <flag name="ups_drivers_al175">Driver for Eltek UPS models with AL175 alarm module</flag> <flag name="ups_drivers_bcmxcp">Driver for UPSes supporting the serial BCM/XCP protocol</flag> diff --git a/sys-power/nut/nut-2.7.2-r2.ebuild b/sys-power/nut/nut-2.7.2-r2.ebuild index 8f9e94b92e46..f787827f2931 100644 --- a/sys-power/nut/nut-2.7.2-r2.ebuild +++ b/sys-power/nut/nut-2.7.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -86,7 +86,7 @@ pkg_setup() { src_prepare() { #ht_fix_file configure.in - epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch" + epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch #epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch #epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch diff --git a/sys-power/nut/nut-2.7.3.ebuild b/sys-power/nut/nut-2.7.3.ebuild index 55dd831f344f..efe9d9f33f9d 100644 --- a/sys-power/nut/nut-2.7.3.ebuild +++ b/sys-power/nut/nut-2.7.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -87,7 +87,7 @@ pkg_setup() { src_prepare() { #ht_fix_file configure.in - epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch" + epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch #epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch #epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild index ddbe49986a35..3d3d49eec6ff 100644 --- a/sys-power/nut/nut-2.7.4-r1.ebuild +++ b/sys-power/nut/nut-2.7.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -88,7 +88,7 @@ pkg_setup() { src_prepare() { #ht_fix_file configure.in - epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch" + epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch #epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch #epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild new file mode 100644 index 000000000000..f33d974e4949 --- /dev/null +++ b/sys-power/nut/nut-2.7.4-r2.ebuild @@ -0,0 +1,295 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +inherit autotools bash-completion-r1 desktop fixheadtails flag-o-matic python-single-r1 systemd toolchain-funcs user + +MY_P=${P/_/-} + +DESCRIPTION="Network-UPS Tools" +HOMEPAGE="https://www.networkupstools.org/" +SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd" + +IUSE="cgi gui ipmi snmp +usb selinux ssl tcpd xml zeroconf" +REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + dev-libs/libltdl:* + virtual/udev + cgi? ( >=media-libs/gd-2[png] ) + gui? ( dev-python/pygtk[${PYTHON_USEDEP}] ) + ipmi? ( sys-libs/freeipmi ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( >=dev-libs/openssl-1 ) + tcpd? ( sys-apps/tcp-wrappers ) + usb? ( virtual/libusb:0= ) + xml? ( >=net-libs/neon-0.25.0 ) + zeroconf? ( net-dns/avahi )" + +BDEPEND=" + virtual/pkgconfig + >=sys-apps/sed-4" + +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-nut )" + +S="${WORKDIR}/${MY_P}" + +# Bug #480664 requested UPS_DRIVERS_IUSE for more flexibility in building this package +SERIAL_DRIVERLIST="al175 bcmxcp belkin belkinunv bestfcom bestfortress bestuferrups bestups dummy-ups etapro everups gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys oldmge-shut mge-utalk microdowell mge-shut oneac optiups powercom rhino safenet solis tripplite tripplitesu upscode2 victronups powerpanel blazer_ser clone clone-outlet ivtscd apcsmart apcsmart-old apcupsd-ups riello_ser nutdrv_qx" +SNMP_DRIVERLIST="snmp-ups" +USB_LIBUSB_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb richcomm_usb riello_usb nutdrv_qx" +USB_DRIVERLIST=${USB_LIBUSB_DRIVERLIST} +#HAL_DRIVERLIST="usbhid-ups bcmxcp_usb tripplite_usb blazer_usb riello_usb nutdrv_qx" +NEONXML_DRIVERLIST="netxml-ups" +IPMI_DRIVERLIST="nut-ipmipsu" +# Now we build from it: +for name in ${SERIAL_DRIVERLIST} ; do + IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}" +done +for name in ${USB_DRIVERLIST} ; do + IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} +ups_drivers_${name}" + REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( usb )" +done +for name in ${NEONXML_DRIVERLIST}; do + IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}" + REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( xml )" +done +for name in ${SNMP_DRIVERLIST} ; do + IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}" + REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( snmp )" +done +for name in ${IPMI_DRIVERLIST} ; do + IUSE_UPS_DRIVERS="${IUSE_UPS_DRIVERS} ups_drivers_${name}" + REQUIRED_USE="${REQUIRED_USE} ups_drivers_${name}? ( ipmi )" +done +IUSE="${IUSE} ${IUSE_UPS_DRIVERS}" + +# public files should be 644 root:root +NUT_PUBLIC_FILES="/etc/nut/{ups,upssched}.conf" +# private files should be 640 root:nut - readable by nut, writeable by root, +NUT_PRIVATE_FILES="/etc/nut/{upsd.conf,upsd.users,upsmon.conf}" +# public files should be 644 root:root, only installed if USE=cgi +NUT_CGI_FILES="/etc/nut/{{hosts,upsset}.conf,upsstats{,-single}.html}" + +PATCHES=( + "${FILESDIR}/${PN}-2.7.2-no-libdummy.patch" + "${FILESDIR}/${PN}-2.7.1-snmpusb-order.patch" + "${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch" +) + +pkg_setup() { + enewgroup nut 84 + enewuser nut 84 -1 /var/lib/nut nut,uucp + # As of udev-104, NUT must be in uucp and NOT in tty. + gpasswd -d nut tty 2>/dev/null + gpasswd -a nut uucp 2>/dev/null + # in some cases on old systems it wasn't in the nut group either! + gpasswd -a nut nut 2>/dev/null + warningmsg ewarn + use gui && python-single-r1_pkg_setup +} + +src_prepare() { + default + + sed -e "s:GD_LIBS.*=.*-L/usr/X11R6/lib \(.*\) -lXpm -lX11:GD_LIBS=\"\1:" \ + -e '/systemdsystemunitdir=.*echo.*sed.*libdir/s,^,#,g' \ + -i configure.ac || die + + sed -e "s:52.nut-usbups.rules:70-nut-usbups.rules:" \ + -i scripts/udev/Makefile.am || die + + rm ltmain.sh m4/lt* m4/libtool.m4 || die + + sed -e 's:@LIBSSL_LDFLAGS@:@LIBSSL_LIBS@:' \ + -i lib/libupsclient{.pc,-config}.in || die #361685 + + use gui && eapply "${FILESDIR}"/NUT-Monitor-1.3-paths.patch + + eautoreconf +} + +src_configure() { + local myconf + append-flags -fno-lto + tc-export CC + tc-export CXX + tc-export AR + + local UPS_DRIVERS="" + for u in $USE ; do + u2=${u#ups_drivers_} + [[ "${u}" != "${u2}" ]] && UPS_DRIVERS="${UPS_DRIVERS} ${u2}" + done + UPS_DRIVERS="${UPS_DRIVERS# }" UPS_DRIVERS="${UPS_DRIVERS% }" + myconf="${myconf} --with-drivers=${UPS_DRIVERS// /,}" + + use cgi && myconf="${myconf} --with-cgipath=/usr/share/nut/cgi" + + # TODO: USE flag for sys-power/powerman + econf \ + --sysconfdir=/etc/nut \ + --datarootdir=/usr/share/nut \ + --datadir=/usr/share/nut \ + --disable-static \ + --with-statepath=/var/lib/nut \ + --with-drvpath=/$(get_libdir)/nut \ + --with-htmlpath=/usr/share/nut/html \ + --with-user=nut \ + --with-group=nut \ + --with-logfacility=LOG_DAEMON \ + --with-dev \ + --with-serial \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + --without-powerman \ + $(use_with cgi) \ + $(use_with ipmi) \ + $(use_with ipmi freeipmi) \ + $(use_with snmp) \ + $(use_with ssl) \ + $(use_with tcpd wrap) \ + $(use_with usb) \ + $(use_with xml neon) \ + $(use_with zeroconf avahi) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + find "${D}" -name '*.la' -delete || die + + dodir /sbin + dosym ../usr/sbin/upsdrvctl /sbin/upsdrvctl + + if use cgi; then + elog "CGI monitoring scripts are installed in /usr/share/nut/cgi." + elog "copy them to your web server's ScriptPath to activate (this is a" + elog "change from the old location)." + elog "If you use lighttpd, see lighttpd_nut.conf in the documentation." + fi + + if use gui; then + python_fix_shebang scripts/python/app + python_domodule scripts/python/module/PyNUT.py + python_doscript scripts/python/app/NUT-Monitor + + insinto /usr/share/nut + doins scripts/python/app/gui-1.3.glade + + dodir /usr/share/nut/pixmaps + insinto /usr/share/nut/pixmaps + doins scripts/python/app/pixmaps/* + + sed -i -e 's/nut-monitor.png/nut-monitor/' -e 's/Application;//' \ + scripts/python/app/${PN}-monitor.desktop || die + + doicon scripts/python/app/${PN}-monitor.png + domenu scripts/python/app/${PN}-monitor.desktop + fi + + # this must be done after all of the install phases + for i in "${D}"/etc/nut/*.sample ; do + mv "${i}" "${i/.sample/}" || die + done + + local DOCS=( AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING ) + einstalldocs + + newdoc lib/README README.lib + newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf + + docinto cables + dodoc docs/cables/* + + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd + newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog + newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail + + keepdir /var/lib/nut + + einfo "Setting up permissions on files and directories" + fperms 0700 /var/lib/nut + fowners nut:nut /var/lib/nut + + # Do not remove eval here, because the variables contain shell expansions. + eval fperms 0640 ${NUT_PRIVATE_FILES} + eval fowners root:nut ${NUT_PRIVATE_FILES} + + # Do not remove eval here, because the variables contain shell expansions. + eval fperms 0644 ${NUT_PUBLIC_FILES} + eval fowners root:root ${NUT_PUBLIC_FILES} + + # Do not remove eval here, because the variables contain shell expansions. + if use cgi; then + eval fperms 0644 ${NUT_CGI_FILES} + eval fowners root:root ${NUT_CGI_FILES} + fi + + # this is installed for 2.4 and fbsd guys + if ! has_version virtual/udev; then + einfo "Installing non-udev hotplug support" + insinto /etc/hotplug/usb + insopts -m 755 + doins scripts/hotplug/nut-usbups.hotplug + fi + + newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc + bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw +} + +pkg_postinst() { + # this is to ensure that everybody that installed old versions still has + # correct permissions + + chown nut:nut "${ROOT}"/var/lib/nut 2>/dev/null + chmod 0700 "${ROOT}"/var/lib/nut 2>/dev/null + + # Do not remove eval here, because the variables contain shell expansions. + eval chown root:nut "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null + eval chmod 0640 "${ROOT}"${NUT_PRIVATE_FILES} 2>/dev/null + + # Do not remove eval here, because the variables contain shell expansions. + eval chown root:root "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null + eval chmod 0644 "${ROOT}"${NUT_PUBLIC_FILES} 2>/dev/null + + # Do not remove eval here, because the variables contain shell expansions. + if use cgi; then + eval chown root:root "${ROOT}"${NUT_CGI_FILES} 2>/dev/null + eval chmod 0644 "${ROOT}"${NUT_CGI_FILES} 2>/dev/null + fi + + warningmsg elog +} + +warningmsg() { + msgfunc="$1" + [ -z "$msgfunc" ] && die "msgfunc not specified in call to warningmsg!" + ${msgfunc} "Please note that NUT now runs under the 'nut' user." + ${msgfunc} "NUT is in the uucp group for access to RS-232 UPS." + ${msgfunc} "However if you use a USB UPS you may need to look at the udev or" + ${msgfunc} "hotplug rules that are installed, and alter them suitably." + ${msgfunc} '' + ${msgfunc} "You are strongly advised to read the UPGRADING file provided by upstream." + ${msgfunc} '' + ${msgfunc} "Please note that upsdrv is NOT automatically started by upsd anymore." + ${msgfunc} "If you have multiple UPS units, you can use their NUT names to" + ${msgfunc} "have a service per UPS:" + ${msgfunc} "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME" + ${msgfunc} '' + ${msgfunc} 'If you want apcupsd to power off your UPS when it' + ${msgfunc} 'shuts down your system in a power failure, you must' + ${msgfunc} 'add nut.powerfail to your shutdown runlevel:' + ${msgfunc} '' + ${msgfunc} 'rc-update add nut.powerfail shutdown' + ${msgfunc} '' + +} diff --git a/sys-power/nut/nut-2.7.4.ebuild b/sys-power/nut/nut-2.7.4.ebuild index a767415e64b7..236c60cfcbab 100644 --- a/sys-power/nut/nut-2.7.4.ebuild +++ b/sys-power/nut/nut-2.7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -87,7 +87,7 @@ pkg_setup() { src_prepare() { #ht_fix_file configure.in - epatch "${FILESDIR}/nut-2.7.2/nut-2.7.2-no-libdummy.patch" + epatch "${FILESDIR}"/nut-2.7.2-no-libdummy.patch epatch "${FILESDIR}"/${PN}-2.6.2-lowspeed-buffer-size.patch #epatch "${FILESDIR}"/${PN}-2.6.3-CVE-2012-2944.patch #epatch "${FILESDIR}"/${PN}-2.6.5-freeipmi_fru.patch |