[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/
commit: 91e7091096936ef82d8ea76edc8b595a4d4f7d92
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Jan 3 07:23:37 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Jan 3 07:24:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e70910
app-office/scribus: fixed
1) added python3_8
2) switched from cmake-utils to cmake
3) removed unused config args
Bug: https://bugs.gentoo.org/691684
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Miroslav Šulc gentoo.org>
app-office/scribus/scribus-.ebuild | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/app-office/scribus/scribus-.ebuild
b/app-office/scribus/scribus-.ebuild
index ac7b913c7f8..da3a47d2520 100644
--- a/app-office/scribus/scribus-.ebuild
+++ b/app-office/scribus/scribus-.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE="tk?"
-inherit cmake-utils desktop flag-o-matic python-single-r1 subversion xdg
+inherit cmake desktop flag-o-matic python-single-r1 subversion xdg
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="https://www.scribus.net/;
@@ -77,7 +77,8 @@ PATCHES=(
)
src_prepare() {
- cmake-utils_src_prepare
+ default
+ _CMAKE_SRC_PREPARE_HAS_RUN=1
rm -r codegen/cheetah scribus/third_party/hyphen || die
@@ -109,8 +110,6 @@ src_configure() {
local mycmakeargs=(
-DHAVE_PYTHON=ON
- -DPYTHON_INCLUDE_PATH=$(python_get_includedir)
- -DPYTHON_LIBRARY=$(python_get_library_path)
-DWANT_DISTROBUILD=ON
-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/
-DWITH_BOOST=$(usex boost)
@@ -123,11 +122,11 @@ src_configure() {
-DWITH_PODOFO=$(usex pdf)
-DWANT_NOTEMPLATES=$(usex !templates)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if ! use tk; then
rm
"${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/tokyocabinet/
commit: f58f12725573d6d789197bdff49bb395afd84b47 Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 3 06:46:09 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 3 06:53:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58f1272 dev-ruby/tokyocabinet: add ruby27 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild index 684621f05a5..7861daae85f 100644 --- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild +++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby23 ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_TASK_TEST=""
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/octokit/
commit: 848b90f23b56cc9aaf7049c3145f28e67da50b6f
Author: Hans de Graaff gentoo org>
AuthorDate: Fri Jan 3 06:33:39 2020 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri Jan 3 06:53:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=848b90f2
dev-ruby/octokit: add 4.15.0
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff gentoo.org>
dev-ruby/octokit/Manifest | 1 +
dev-ruby/octokit/octokit-4.15.0.ebuild | 37 ++
2 files changed, 38 insertions(+)
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 0cb48c7244d..1dc35684bd5 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1 +1,2 @@
DIST octokit-4.14.0.tar.gz 3068165 BLAKE2B
e50efa246273422daf5aed8e619465886962d361d129a310974c21bbc683c7444ee99e3dc01c184497683d07a48d852c006ab56c6cd4bea8660f16e7ec5eee98
SHA512
2aff18492c0207b8c7ced23adf0e76260d2976331563e22f7a130445b19b816a00281a86b4161d6709025d058c848ef3f7d1a5c64323954f8c03a59be6f6b132
+DIST octokit-4.15.0.tar.gz 3089749 BLAKE2B
d10df675c067f0bfc86bd78aa05e48fb37bdf8d4d5f9317d7463838ec9e870380bc503eb621a02a332b6a26bc1780c5d77955b93c695e18674c792b01aa702c3
SHA512
8616dc97c2aee68ee5919045446ad34d3122bda71f0a9e48a7ef3c04ef2e706bb59f7bd344de9f21f912a927aedfdad11f73119e52f62729173d04f052a0c972
diff --git a/dev-ruby/octokit/octokit-4.15.0.ebuild
b/dev-ruby/octokit/octokit-4.15.0.ebuild
new file mode 100644
index 000..469e4b38183
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.15.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb;
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+ >=dev-ruby/faraday-0.9
+ >=dev-ruby/sawyer-0.8.0
+"
+
+ruby_add_bdepend "test? ( dev-ruby/mime-types
+ >=dev-ruby/netrc-0.7.7
+ dev-ruby/vcr:3
+ dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+ sed -i -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"'
spec/helper.rb || die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/bundler/
commit: 22b8340c1b99ce1ab526d2efd80fbbe0a3d21d4b Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 3 06:28:22 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 3 06:53:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22b8340c dev-ruby/bundler: add 2.1.3 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/bundler/Manifest | 1 + dev-ruby/bundler/bundler-2.1.3.ebuild | 32 2 files changed, 33 insertions(+) diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest index d639f5ec404..c086f1e726b 100644 --- a/dev-ruby/bundler/Manifest +++ b/dev-ruby/bundler/Manifest @@ -1,2 +1,3 @@ DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120c22c5f76423c6c5f4e4d33206c8ef41c64e54ea53eb610a0d865beba19d3c033e8f65913564963319bb523f SHA512 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02 DIST bundler-2.1.2.gem 396800 BLAKE2B 20540af4873f968412ddec542379a97b200d86a66b5e69ff9f2f57140063e49dd2ee52ed03e2fbaa1a8da8a3e12d0d4d2e3468031afdaee09a6aeed9910aeb60 SHA512 2a3b42fa2c6f40998c900eaf9d81d6417970f3daa572e4f1c5cc954fd8ce1e3cacbda0dc9b77d44b2fa756cfb1e72838ef3edee1812881198bbe8c946017e22b +DIST bundler-2.1.3.gem 396800 BLAKE2B 27fdf7b3b823a66d2e8a7671f0c8fb03831f78e7623b44340c8d2b8064fb7e197308bc04dc65d4ce9dfabf26e565e51187dd89c82283ef41e614000a0c045fe3 SHA512 39ffce683d85b1afcbbdff81fe66784b94ea8c3be590208f4b8645959d69c9d936564eaad239234c4b461550c9fae411e497d6c26a614f63be442466992a5161 diff --git a/dev-ruby/bundler/bundler-2.1.3.ebuild b/dev-ruby/bundler/bundler-2.1.3.ebuild new file mode 100644 index 000..72ddf69d121 --- /dev/null +++ b/dev-ruby/bundler/bundler-2.1.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +# The specs require a number of gems to be installed in a temporary +# directory, but this requires network access. They also don't work +# when run with a path that contains "-". +RUBY_FAKEGEM_RECIPE_TEST="none" + +# No documentation task +RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md" + +RUBY_FAKEGEM_BINDIR="exe" + +RUBY_FAKEGEM_EXTRAINSTALL="man" + +inherit ruby-fakegem + +DESCRIPTION="An easy way to vendor gem dependencies" +HOMEPAGE="https://github.com/carlhuda/bundler; + +LICENSE="MIT" +SLOT="$(ver_cut 1)" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+doc test" + +ruby_add_rdepend virtual/rubygems + +RDEPEND+=" dev-vcs/git !!
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/totoridipjp/
commit: fb53b694c781e96821b48b9f6f5a521ac7d02ea2 Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 3 06:43:47 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 3 06:53:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb53b694 dev-ruby/totoridipjp: add ruby27 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild index b088e625b2c..53ae711839c 100644 --- a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild +++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_RECIPE_TEST="none"
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/transaction-simple/
commit: 90602dca3fda575b587003ea6cdc414afa83b07f Author: Hans de Graaff gentoo org> AuthorDate: Fri Jan 3 06:37:44 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Fri Jan 3 06:53:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90602dca dev-ruby/transaction-simple: add ruby27 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild index 3ba729a19f8..442e58009e7 100644 --- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild +++ b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby23 ruby24 ruby25 ruby26" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_RECIPE_TEST="none"
[gentoo-commits] repo/gentoo:master commit in: dev-python/kconfiglib/files/, dev-python/kconfiglib/
commit: 416cacb2f7973f1af6a5bc0894ba9309716eab46
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:38:33 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:39:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416cacb2
dev-python/kconfiglib: remove old
Signed-off-by: Tim Harder gentoo.org>
dev-python/kconfiglib/Manifest | 1 -
.../files/kconfiglib-12.12.1-setup.patch | 16 -
dev-python/kconfiglib/kconfiglib-12.12.1.ebuild| 40 --
3 files changed, 57 deletions(-)
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index 1d659882303..068202d00b0 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,3 +1,2 @@
-DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B
d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9
SHA512
49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
DIST kconfiglib-13.2.0.tar.gz 181115 BLAKE2B
81aeab65c4d7008dad33d508eb2be5ed53187943c1ec5112a87a47a5f9bb661c521b0d61a3da63da3233f168d62ab6bb5cdf6e3702e53f960159b7ca13c8a0cf
SHA512
9d8c76014aa7faa93af216849859eca9bfdc0d4cd3e030e47b72acfdd4981ac1581747adf91bca58a4e8d86b151988309f36c3f94a1ebb216a1412fd004fafd2
DIST kconfiglib-13.7.0.tar.gz 182782 BLAKE2B
976a8e4e377933e42dc45c79598a175d302d34f48bfadd764c0cbfa2ddd4e15ae6ba22467c50d41657abbaa1f4495c556fb4c1deb9c96e1119a7bdd6ae8a3378
SHA512
0376b2c4e68b7ce4f105f52a3b4793a23cb844dbd9ab183abbdd79e2f7958e3be372024ce82295902af974f010c73c4ac97a4147bdac8ee9b52900bc15b8bb6f
diff --git a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
b/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
deleted file mode 100644
index b5225e90d5d..000
--- a/dev-python/kconfiglib/files/kconfiglib-12.12.1-setup.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Python2's ConfigParser module used by setuptools throws parsing errors when
-encountering tab characters.
-
Kconfiglib-12.12.1/setup.cfg
-+++ Kconfiglib-12.12.1/setup.cfg
-@@ -1,6 +1,6 @@
- [bdist_wheel]
-- # We support both Python 2 and Python 3
-- universal = 1
-+# We support both Python 2 and Python 3
-+universal = 1
- [metadata]
-- # Include the license file in wheels
-- license_file = LICENSE.txt
-+# Include the license file in wheels
-+license_file = LICENSE.txt
diff --git a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
b/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
deleted file mode 100644
index f7c488a885c..000
--- a/dev-python/kconfiglib/kconfiglib-12.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-DESCRIPTION="A flexible Python Kconfig implementation"
-HOMEPAGE="https://github.com/ulfalizer/Kconfiglib
https://pypi.org/project/kconfiglib/;
-SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-# pypi tarballs don't include tests
-#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/k/K}
-
-PATCHES=( "${FILESDIR}"/${P}-setup.patch )
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # hacks to run tests
- mkdir Kconfiglib || die
- ln -s ../tests Kconfiglib || die
- # don't run kernel Kconfig compat tests
- sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
-}
-
-python_test() {
- "${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
-}
[gentoo-commits] repo/gentoo:master commit in: dev-python/kconfiglib/
commit: 6e1989ebfdce8227d13aecb90c506211a6b9ff85
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:38:12 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:39:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1989eb
dev-python/kconfiglib: version bump to 13.7.0
Signed-off-by: Tim Harder gentoo.org>
dev-python/kconfiglib/Manifest | 1 +
dev-python/kconfiglib/kconfiglib-13.7.0.ebuild | 38 ++
2 files changed, 39 insertions(+)
diff --git a/dev-python/kconfiglib/Manifest b/dev-python/kconfiglib/Manifest
index db8807dabaa..1d659882303 100644
--- a/dev-python/kconfiglib/Manifest
+++ b/dev-python/kconfiglib/Manifest
@@ -1,2 +1,3 @@
DIST kconfiglib-12.12.1.tar.gz 181307 BLAKE2B
d256148bd6bf01f7951c78751604eae1be4c2fc156b815bdb570e6fcf185c2f5c97259f6ce0ed275104234ff7180afa2000a81feb281e745a8a0c4db162f57b9
SHA512
49e8746e6c83a93b7500130b21b864346ab8106c0c161de0ec62b3efff794080e734d34d88cd9c816c0d6514465729fbc3a4334fcc9c0a68f17c1688bb210325
DIST kconfiglib-13.2.0.tar.gz 181115 BLAKE2B
81aeab65c4d7008dad33d508eb2be5ed53187943c1ec5112a87a47a5f9bb661c521b0d61a3da63da3233f168d62ab6bb5cdf6e3702e53f960159b7ca13c8a0cf
SHA512
9d8c76014aa7faa93af216849859eca9bfdc0d4cd3e030e47b72acfdd4981ac1581747adf91bca58a4e8d86b151988309f36c3f94a1ebb216a1412fd004fafd2
+DIST kconfiglib-13.7.0.tar.gz 182782 BLAKE2B
976a8e4e377933e42dc45c79598a175d302d34f48bfadd764c0cbfa2ddd4e15ae6ba22467c50d41657abbaa1f4495c556fb4c1deb9c96e1119a7bdd6ae8a3378
SHA512
0376b2c4e68b7ce4f105f52a3b4793a23cb844dbd9ab183abbdd79e2f7958e3be372024ce82295902af974f010c73c4ac97a4147bdac8ee9b52900bc15b8bb6f
diff --git a/dev-python/kconfiglib/kconfiglib-13.7.0.ebuild
b/dev-python/kconfiglib/kconfiglib-13.7.0.ebuild
new file mode 100644
index 000..0adf3b139b7
--- /dev/null
+++ b/dev-python/kconfiglib/kconfiglib-13.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8} pypy3 )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="A flexible Python Kconfig implementation"
+HOMEPAGE="https://github.com/ulfalizer/Kconfiglib
https://pypi.org/project/kconfiglib/;
+SRC_URI="https://github.com/ulfalizer/Kconfiglib/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+# pypi tarballs don't include tests
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}"
+
+S=${WORKDIR}/${P/k/K}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ # hacks to run tests
+ mkdir Kconfiglib || die
+ ln -s ../tests Kconfiglib || die
+ # don't run kernel Kconfig compat tests
+ sed -i 's/run_compatibility_tests()$/#\0/' testsuite.py || die
+}
+
+python_test() {
+ "${PYTHON}" testsuite.py || die "tests failed with ${EPYTHON}"
+}
[gentoo-commits] repo/gentoo:master commit in: virtual/linux-sources/
commit: b39868c58211485d65964feab46c985ea907caf3
Author: Michał Górny gentoo org>
AuthorDate: Fri Jan 3 06:21:31 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Jan 3 06:34:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b39868c5
virtual/linux-sources: *-bin too
Signed-off-by: Michał Górny gentoo.org>
.../{linux-sources-3-r2.ebuild => linux-sources-3-r3.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/virtual/linux-sources/linux-sources-3-r2.ebuild
b/virtual/linux-sources/linux-sources-3-r3.ebuild
similarity index 95%
rename from virtual/linux-sources/linux-sources-3-r2.ebuild
rename to virtual/linux-sources/linux-sources-3-r3.ebuild
index d8bca86e677..4d0b4821990 100644
--- a/virtual/linux-sources/linux-sources-3-r2.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r3.ebuild
@@ -24,4 +24,5 @@ RDEPEND="
sys-kernel/aufs-sources
sys-kernel/raspberrypi-sources
sys-kernel/vanilla-kernel
+ sys-kernel/vanilla-kernel-bin
)"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
commit: b825cfa9c9e38cc3da781a90d3a9de0973fda96e
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:28:59 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:31:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b825cfa9
media-gfx/gmic: version bump to 2.8.1
And update from the cmake-utils to the cmake eclass.
Signed-off-by: Tim Harder gentoo.org>
media-gfx/gmic/Manifest | 1 +
media-gfx/gmic/gmic-2.8.1.ebuild | 173 +++
2 files changed, 174 insertions(+)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index dbb05f62c7b..edf579caa75 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,4 @@
DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B
5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3
SHA512
8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B
8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012
SHA512
9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B
192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a
SHA512
d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
+DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B
3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9
SHA512
0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
new file mode 100644
index 000..1d3205fc5a2
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.8.1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+inherit cmake bash-completion-r1
+
+if [[ ${PV} == "" ]]; then
+ EGIT_REPO_URI="https://github.com/dtschump/gmic.git;
+ inherit git-r3
+else
+ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz;
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic;
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr
openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+ || ( cli gimp krita qt5 )
+ gimp? ( png zlib fftw X )
+ krita? ( png zlib fftw X )
+ qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+ >=dev-qt/qtcore-${MIN_QT_VER}:5=
+ >=dev-qt/qtgui-${MIN_QT_VER}:5=
+ >=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+ >=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ fftw? ( sci-libs/fftw:3.0=[threads] )
+ gimp? (
+ >=media-gfx/gimp-2.8.0
+ ${QT_DEPEND}
+ )
+ graphicsmagick? ( media-gfx/graphicsmagick:0= )
+ jpeg? ( virtual/jpeg:0 )
+ krita? ( ${QT_DEPEND} )
+ opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+ openexr? (
+ media-libs/ilmbase:0=
+ media-libs/openexr:0=
+ )
+ png? ( media-libs/libpng:0= )
+ qt5? ( ${QT_DEPEND} )
+ tiff? ( media-libs/tiff:0 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+ ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+ gimp? ( dev-qt/linguist-tools )
+ krita? ( dev-qt/linguist-tools )
+ qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible
compiler"
+ fi
+
+ if ! test-flag-CXX -std=c++11 ; then
+ die "You need at least GCC 4.7.x or Clang >= 3.3 for
C++11-specific compiler flags"
+ fi
+}
+
+src_prepare() {
+ local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
+ cmake_src_prepare
+ sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+ if use gimp || use krita || use qt5; then
+ # respect user flags
+ sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt ||
die
+
+ # fix linking with fftw when thread support is enabled
+ pushd "${S}"/gmic-qt > /dev/null || die
+ PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: media-libs/exiftool/
commit: d60b227ce83a7d5d70116388c6f8abd08ac005ed
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:22:01 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:31:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60b227c
media-libs/exiftool: version bump to 11.81
Signed-off-by: Tim Harder gentoo.org>
media-libs/exiftool/Manifest | 1 +
media-libs/exiftool/exiftool-11.81.ebuild | 25 +
2 files changed, 26 insertions(+)
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 869f599acf0..44e9511dbc1 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,2 +1,3 @@
DIST Image-ExifTool-11.76.tar.gz 4691479 BLAKE2B
a7c4ab28c281ce9a3d95934038d99a5ebaf4c262ae181f96b17fe2449187fa1f03fe54ad6bf2f0f9729cbc959bcba5eeb19c720e392871b6bffde1bce251ed04
SHA512
f99f5335fa84ba5038b608de8b817f09c6cd81c850e27cd4b4b7be37455318c96eaa1d1ab9fb42abd74ce4587a334f189d46fa63f3f207ab58dee39f8395c309
DIST Image-ExifTool-11.80.tar.gz 4697210 BLAKE2B
682ab224188f0094ca964d217bc2547aa928fdfffdc47423c9684626ac9211fe2518ea89d2162d33322718fd1abe062cbc8ff478cecb55ccdcf289894271058b
SHA512
302c358f8d727ad37030bb0678ee1ad6f235f842037485e2cad52a53a3b9e7e091b30c69e1b3f1ab8f42a4d1d674a4207276abb896abf5370a3a237d50eeb228
+DIST Image-ExifTool-11.81.tar.gz 4698517 BLAKE2B
6289583559e40ec5aa92c3dc9eaf42d42b95a4065d04ee731827fa2d1ea4e80d2c54b6dfb916e1470f43d7657035bd5dcb64740adf82ec575d1e7dd2bf08f5f2
SHA512
11bfb4799676d2e28d33e9b36684f7c9fa76677539901031f7e0dddefda65fb6e21b68c1d794d1c369fe5dc34176822124f1795892659540f0892859989a7332
diff --git a/media-libs/exiftool/exiftool-11.81.ebuild
b/media-libs/exiftool/exiftool-11.81.ebuild
new file mode 100644
index 000..58ee12770a1
--- /dev/null
+++ b/media-libs/exiftool/exiftool-11.81.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_NAME=Image-ExifTool
+inherit perl-module
+
+DESCRIPTION="Read and write meta information in image, audio and video files"
+HOMEPAGE="https://exiftool.org/;
+SRC_URI="https://exiftool.org/${DIST_P}.tar.gz;
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+IUSE="doc"
+
+SRC_TEST="do"
+
+src_install() {
+ perl-module_src_install
+ use doc && dodoc -r html/
+
+ insinto /usr/share/${PN}
+ doins -r fmt_files config_files arg_files
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
commit: 4e9ad7bfce476e056f61fcaba6b256038bc6598e
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:29:28 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:31:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ad7bf
media-gfx/gmic: remove old
Signed-off-by: Tim Harder gentoo.org>
media-gfx/gmic/Manifest| 2 -
media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch | 54
media-gfx/gmic/gmic-2.7.0.ebuild | 171 -
media-gfx/gmic/gmic-2.7.1.ebuild | 171 -
4 files changed, 398 deletions(-)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index edf579caa75..ccf872e7f68 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,2 @@
-DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B
5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3
SHA512
8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
-DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B
8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012
SHA512
9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B
192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a
SHA512
d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B
3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9
SHA512
0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
diff --git a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
deleted file mode 100644
index e268558a95e..000
--- a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking with fftw when thread support is enabled and fix source code file
-name typo.
-
gmic-qt/CMakeLists.txt
-+++ gmic-qt/CMakeLists.txt
-@@ -13,6 +13,7 @@
- set(CMAKE_AUTOUIC OFF)
- set(CMAKE_AUTORCC ON)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
-+set(EXTRA_LIBRARIES)
-
- set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be
built: gimp, krita or none.")
- if (${GMIC_QT_HOST} STREQUAL "none")
-@@ -143,8 +144,13 @@
- #
- find_package(FFTW3 REQUIRED)
- add_definitions(-Dcimg_use_fftw3 )
--add_definitions(-Dcimg_use_fftw3_singlethread )
- include_directories(${FFTW3_INCLUDE_DIR})
-+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
-+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
-+add_definitions(-Dcimg_use_fftw3_singlethread)
-+else()
-+list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
-+endif()
-
- #
- # CURL
-@@ -185,6 +191,7 @@
- ${PNG_LIBRARIES}
- ${FFTW3_LIBRARIES}
- ${ZLIB_LIBRARIES}
-+${EXTRA_LIBRARIES}
- )
-
- if (CURL_FOUND)
-@@ -278,7 +285,7 @@
- src/FilterParameters/ChoiceParameter.h
- src/FilterParameters/ColorParameter.h
- src/FilterParameters/ConstParameter.h
-- src/FilterParameters/CustomDoubleSpinbox.h
-+ src/FilterParameters/CustomDoubleSpinBox.h
- src/FilterParameters/FileParameter.h
- src/FilterParameters/FilterParametersWidget.h
- src/FilterParameters/FloatParameter.h
-@@ -350,7 +357,7 @@
- src/FilterParameters/ChoiceParameter.cpp
- src/FilterParameters/ColorParameter.cpp
- src/FilterParameters/ConstParameter.cpp
-- src/FilterParameters/CustomDoubleSpinbox.cpp
-+ src/FilterParameters/CustomDoubleSpinBox.cpp
- src/FilterParameters/FileParameter.cpp
- src/FilterParameters/FilterParametersWidget.cpp
- src/FilterParameters/FloatParameter.cpp
diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
deleted file mode 100644
index 1edb9254ff0..000
--- a/media-gfx/gmic/gmic-2.7.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_BUILD_TYPE=Release
-CMAKE_MIN_VERSION=3.9
-
-inherit cmake-utils bash-completion-r1
-
-if [[ ${PV} == "" ]]; then
- EGIT_REPO_URI="https://github.com/dtschump/gmic.git;
- inherit git-r3
-else
- SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz;
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic;
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg
[gentoo-commits] repo/gentoo:master commit in: media-libs/cimg/
commit: 9a09ca545da496a6b25fdc025c317312515c219f
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:19:39 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:19:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a09ca54
media-libs/cimg: remove old
Signed-off-by: Tim Harder gentoo.org>
media-libs/cimg/Manifest | 1 -
media-libs/cimg/cimg-2.7.0.ebuild | 26 --
2 files changed, 27 deletions(-)
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index cbbbcd7f621..07834044965 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,3 +1,2 @@
-DIST cimg-2.7.0.tar.gz 11076642 BLAKE2B
db2c8715f25ec160cdf41ac2cc1bee366ef49dbd0b3e5bd5bf6b4b8a0ba4c880f6af4cbd78d843abf0edd99ca45337fd1bd5dc25779b94984a64f5217c3430a5
SHA512
b1b12f4b36d7d799da330bb2854732e6207aa73b4d28bf9a13408154664c2d518652065738d1964da00a022449a3b618b25b72ec17deec6df463ff6811c21b21
DIST cimg-2.7.2.tar.gz 11204962 BLAKE2B
dce4198e23d814fc4bd481388ca959cc831927329c5611b057aeb88cb5c3f80facc87433482ee6c1048b8478147db25ca592ecafe18528def156f30f626eef22
SHA512
ad251d2d433497be2fbf812dba7efecfdedc1b38770c34d600f5848fe91c130b8952c8d86fcd58894849175aa31358225e255b1558173ead79c47a985c7b11b2
DIST cimg-2.8.1.tar.gz 11208148 BLAKE2B
1d53c11f76c63c453b9090d01c9b970a5d38f9accc13ed5f03d3107d218ff1b69a9e3d469cd9a5a51f90a0d0565efeb2523a2f0f7964752ca8ea8f2e2115f45e
SHA512
df7bf86e5957c998180494eba70218a86f6e33c85d3f5d441a695a35725bb811956a945f40cc73573d6507dd4bcb25589ec05083ac99539365f73e6bd1247dd9
diff --git a/media-libs/cimg/cimg-2.7.0.ebuild
b/media-libs/cimg/cimg-2.7.0.ebuild
deleted file mode 100644
index a3f01bc9ba2..000
--- a/media-libs/cimg/cimg-2.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg;
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-S=${WORKDIR}/CImg-v.${PV}
-
-src_install() {
- doheader CImg.h
- dodoc README.txt
-
- use doc && dodoc -r html
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/cimg/
commit: 04de04289b60409707736243d28475cfe20f7335
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 3 06:19:24 2020 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 3 06:19:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04de0428
media-libs/cimg: version bump to 2.8.1
Signed-off-by: Tim Harder gentoo.org>
media-libs/cimg/Manifest | 1 +
media-libs/cimg/cimg-2.8.1.ebuild | 26 ++
2 files changed, 27 insertions(+)
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index a1a2823da46..cbbbcd7f621 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,2 +1,3 @@
DIST cimg-2.7.0.tar.gz 11076642 BLAKE2B
db2c8715f25ec160cdf41ac2cc1bee366ef49dbd0b3e5bd5bf6b4b8a0ba4c880f6af4cbd78d843abf0edd99ca45337fd1bd5dc25779b94984a64f5217c3430a5
SHA512
b1b12f4b36d7d799da330bb2854732e6207aa73b4d28bf9a13408154664c2d518652065738d1964da00a022449a3b618b25b72ec17deec6df463ff6811c21b21
DIST cimg-2.7.2.tar.gz 11204962 BLAKE2B
dce4198e23d814fc4bd481388ca959cc831927329c5611b057aeb88cb5c3f80facc87433482ee6c1048b8478147db25ca592ecafe18528def156f30f626eef22
SHA512
ad251d2d433497be2fbf812dba7efecfdedc1b38770c34d600f5848fe91c130b8952c8d86fcd58894849175aa31358225e255b1558173ead79c47a985c7b11b2
+DIST cimg-2.8.1.tar.gz 11208148 BLAKE2B
1d53c11f76c63c453b9090d01c9b970a5d38f9accc13ed5f03d3107d218ff1b69a9e3d469cd9a5a51f90a0d0565efeb2523a2f0f7964752ca8ea8f2e2115f45e
SHA512
df7bf86e5957c998180494eba70218a86f6e33c85d3f5d441a695a35725bb811956a945f40cc73573d6507dd4bcb25589ec05083ac99539365f73e6bd1247dd9
diff --git a/media-libs/cimg/cimg-2.8.1.ebuild
b/media-libs/cimg/cimg-2.8.1.ebuild
new file mode 100644
index 000..3205e035da6
--- /dev/null
+++ b/media-libs/cimg/cimg-2.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg;
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S=${WORKDIR}/CImg-v.${PV}
+
+src_install() {
+ doheader CImg.h
+ dodoc README.txt
+
+ use doc && dodoc -r html
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
commit: c56d4c9de8b543dd245a6b7d38bbd0b32428a12c
Author: Davide Pesavento gentoo org>
AuthorDate: Fri Jan 3 03:46:46 2020 +
Commit: Davide Pesavento gentoo org>
CommitDate: Fri Jan 3 05:57:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c56d4c9d
dev-util/qbs: remove 1.13.1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Davide Pesavento gentoo.org>
dev-util/qbs/Manifest | 1 -
dev-util/qbs/qbs-1.13.1.ebuild | 123 -
2 files changed, 124 deletions(-)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index b574101fcda..ab1f44a2a46 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,3 +1,2 @@
DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
SHA512
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
-DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B
d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7
SHA512
1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597
DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B
5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5
SHA512
df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
diff --git a/dev-util/qbs/qbs-1.13.1.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
deleted file mode 100644
index 0ce9c72b16a..000
--- a/dev-util/qbs/qbs-1.13.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-MY_P=${PN}-src-${PV}
-
-DESCRIPTION="Modern build tool for software projects"
-HOMEPAGE="https://wiki.qt.io/Qbs;
-SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz;
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-# see bug 581874 for the qttest dep in RDEPEND
-RDEPEND="
- dev-qt/qtcore:5=
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtscript:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- test? ( dev-qt/qttest:5 )
-"
-DEPEND="${RDEPEND}
- doc? (
- dev-qt/qdoc:5
- dev-qt/qthelp:5
- )
- test? (
- dev-qt/linguist-tools:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- )
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- default
-
- if ! use examples; then
- sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
- fi
-
- # replace hardcoded "lib" with QBS_LIBRARY_DIRNAME
- sed -i -e '1i include(src/library_dirname.pri)' \
- -e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
- static-res.pro || die
-
- # respect LDFLAGS
- sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || die
-
- echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
-
- # skip several tests that fail and/or have additional deps
- sed -i \
- -e 's/findArchiver("7z")/""/' `# requires p7zip,
fails` \
- -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and
jar` \
- -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug
527652` \
- -e
's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires
nodejs and typescript` \
- tests/auto/blackbox/tst_blackbox.cpp || die
-
- # requires jdk, fails, bug 585398
- sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
-}
-
-src_configure() {
- local myqmakeargs=(
- qbs.pro # bug 523218
- -recursive
- CONFIG+=qbs_disable_rpath
- CONFIG+=qbs_enable_project_file_updates
- $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
- QBS_INSTALL_PREFIX="${EPREFIX}/usr"
- QBS_LIBRARY_DIRNAME="$(get_libdir)"
- )
- eqmake5 "${myqmakeargs[@]}"
-}
-
-src_test() {
- einfo "Setting up test environment in ${T}"
-
- export HOME=${T}
- export LD_LIBRARY_PATH=${S}/$(get_libdir)
- export QBS_AUTOTEST_PROFILE=autotests
-
- "${S}"/bin/qbs-setup-toolchains --detect || die
- "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" autotests || die
-
- einfo "Running autotests"
-
- # simply exporting LD_LIBRARY_PATH doesn't work
- # we have to use a custom testrunner script
- local
[gentoo-commits] repo/gentoo:master commit in: dev-util/qbs/
commit: 4fdcff7df36ba40bd1932aabf34f7cd827608f7a
Author: Davide Pesavento gentoo org>
AuthorDate: Fri Jan 3 05:55:38 2020 +
Commit: Davide Pesavento gentoo org>
CommitDate: Fri Jan 3 05:57:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdcff7d
dev-util/qbs: add 1.15.0
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Davide Pesavento gentoo.org>
dev-util/qbs/Manifest | 1 +
dev-util/qbs/qbs-1.15.0.ebuild | 116 +
2 files changed, 117 insertions(+)
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index ab1f44a2a46..aacb348c605 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,2 +1,3 @@
DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B
8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13
SHA512
eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
DIST qbs-src-1.14.1.tar.gz 4365537 BLAKE2B
5a51ddea64023c76b6934634f72ab19d54a3e857efe30d7698a3970d099e436599b53b369d81434cc8e721606513bd487010047e60ccfa289574f606cf020dc5
SHA512
df9031e2749ba598129daef0a6b4322ad964c87a33bfd079bb231170da49c42708740ec63e351607b7e9da1dd11310802b14917eaf2ec97bb747a6df9890f2f3
+DIST qbs-src-1.15.0.tar.gz 4531882 BLAKE2B
95ef24a3c63972a5c4111b68c19d57d83552c8c2fd771bda6291d99564c2e3e80488700ceaf88e64bf6edca1d156dc912757ebe682cb5e3d5aec015640e8641f
SHA512
461ac2e1574c163149b080936233144b3941024e7f61c2b2514e58089b7fa100e576c0336e16a3c51a0f4b77e575081350550e23b543e86a2023d524aba18d07
diff --git a/dev-util/qbs/qbs-1.15.0.ebuild b/dev-util/qbs/qbs-1.15.0.ebuild
new file mode 100644
index 000..5fa4f467db3
--- /dev/null
+++ b/dev-util/qbs/qbs-1.15.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils toolchain-funcs
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Modern build tool for software projects"
+HOMEPAGE="https://wiki.qt.io/Qbs;
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz;
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+# see bug 581874 for the qttest dep in RDEPEND
+RDEPEND="
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ test? ( dev-qt/qttest:5 )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-qt/qdoc:5
+ dev-qt/qthelp:5
+ )
+ test? (
+ dev-qt/linguist-tools:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+
+ if ! use examples; then
+ sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die
+ fi
+
+ echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
+
+ # skip several tests that fail and/or have additional deps
+ sed -i \
+ -e 's/findArchiver("7z")/""/' `# requires p7zip,
fails` \
+ -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and
jar` \
+ -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug
527652` \
+ -e
's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires
nodejs and typescript` \
+ tests/auto/blackbox/tst_blackbox.cpp || die
+
+ # requires jdk, fails, bug 585398
+ sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die
+}
+
+src_configure() {
+ local myqmakeargs=(
+ qbs.pro # bug 523218
+ -recursive
+ CONFIG+=qbs_disable_rpath
+ CONFIG+=qbs_enable_project_file_updates
+ $(usex test 'CONFIG+=qbs_enable_unit_tests' '')
+ QBS_INSTALL_PREFIX="${EPREFIX}/usr"
+ QBS_LIBRARY_DIRNAME="$(get_libdir)"
+ )
+ eqmake5 "${myqmakeargs[@]}"
+}
+
+src_test() {
+ einfo "Setting up test environment in ${T}"
+
+ export HOME=${T}
+ export LD_LIBRARY_PATH=${S}/$(get_libdir)
+ export QBS_AUTOTEST_PROFILE=testProfile
+
+ "${S}"/bin/qbs-setup-toolchains "$(tc-getCC)" testToolchain || die
+ "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake"
${QBS_AUTOTEST_PROFILE} || die
+ "${S}"/bin/qbs-config
profiles.${QBS_AUTOTEST_PROFILE}.qbs.targetPlatform linux || die
+
+ einfo "Running autotests"
+
+ # simply exporting LD_LIBRARY_PATH doesn't work
+ # we have to use a custom testrunner script
+ local testrunner=${WORKDIR}/gentoo-testrunner
+ cat <<-EOF > "${testrunner}"
+ #!/bin/sh
+ export
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}"
+ exec "\$@"
+
[gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/
commit: d883b7e82d7aefa0d36b1801eae6519600a505d6 Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Jan 3 05:18:39 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Jan 3 05:18:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d883b7e8 dev-java/icedtea-bin: restore amd64 and x86 keywords for 3.14 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> dev-java/icedtea-bin/Manifest | 4 dev-java/icedtea-bin/icedtea-bin-3.14.0.ebuild | 7 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest index 35d38eb46cd..4e98a6b3faa 100644 --- a/dev-java/icedtea-bin/Manifest +++ b/dev-java/icedtea-bin/Manifest @@ -4,10 +4,12 @@ DIST icedtea-bin-core-3.13.0-arm64.tar.xz 61700464 BLAKE2B 333202f47b63ae050aa43 DIST icedtea-bin-core-3.13.0-ppc64.tar.xz 55002324 BLAKE2B b93312e3e82c75d2611f6907c57046fc4dc1498be989fde841a43162c381247fd934c4c3d83493455f4aecec338cb343e30cf26a313cd0d26dcca9e76ee2a2d3 SHA512 c04d0afe3b5b9a592bc9d9d26cc15e920edc6a6646337f969b889388d0ae08ddfdd84435076538b27106dc7dc1edc31d7dc84abd744de927d403e8fcde0fe742 DIST icedtea-bin-core-3.13.0-ppc64le.tar.xz 55089960 BLAKE2B 915a80eefe41dc5cbfa7baa4db133fda0057a43e2c4d4e5c042d0ec2b8cd174fd4950cf66ec60e41f038036a09b309533ad4cf647cc9f1c6641ac040d38c6afc SHA512 a914559df5981cc88d54fed48c013632771b094b49198fc742718c549c0188846a399d1fb28710bdcf1b224df6e5588aeb2d29feebd523943759e3f3fff4b20e DIST icedtea-bin-core-3.13.0-x86.tar.xz 61579520 BLAKE2B 736941e5b41c4f0e13f5d60e4cefe716c7759fd4eb77e8cf7bb831c13525e8d007e5039dfb15c75ac0c9a18bd3d037564eca2bed4a6229c598f8ea8d92aa58e7 SHA512 d0f70ea72a55e5abfd459f4ce7eb4e4cee6779860c6bf95cea0bf682896cba2c2e836c613d80c5f90cf5bb14ae9abc9f0692aa4cea3bb0f6c245f8f21c842fe7 +DIST icedtea-bin-core-3.14.0-amd64.tar.xz 62155444 BLAKE2B cfa6a11778d159026151fffcfa7189fe45d23d22d810375f36f237afcdcd646be73788cb5cfa0a2e4822026ae58456b69f6f4baa03c7d143429f2ffe55d73e19 SHA512 2d29f7f61ef67d93b57318c34fbccf99077f40c6322bc774326e33ba11c8dc2a07d34c8e9d8b500feaeabe4aa45644d03140b57a3996261d13da9f9bf85ebf5c DIST icedtea-bin-core-3.14.0-arm.tar.xz 58158680 BLAKE2B 3899136ccb43550129a33996ec50f7b60b9b3d118f758e3d5c51a837f6222033a32677fca58f8c95de12abb4b1b8940190a442d9b1901808307634662af7aeb8 SHA512 8a56048439f50bd01ce4723f8f9b97f764f655370927dad0a92db9d678e8eb797ce3a6d813a247f60d4c38ae1a3de3ab9a3b78341d19977ef05d939e85194e67 DIST icedtea-bin-core-3.14.0-arm64.tar.xz 61710384 BLAKE2B f02c68f71a057232f9a8ea7476b476a376c0bd508b53f1043dfc6a6f86b5701e50d0d6be7d627436c3cff931ebe3c56f0d634196d8e1b96058142421214d525d SHA512 853b7ef0d21d0d9645ef3bc4b5cb24ed43ca71687d2630a10d3087a4ea82855f98cc7c8190b0de62a746cfa214489c8ac3afdc17dfc13dbb61dd4c8a908da31b DIST icedtea-bin-core-3.14.0-ppc64.tar.xz 55154368 BLAKE2B 0a509f1ae6ef885c18cf15a7c4dbe984650e242ea820aa65602cfc1a001f0123151fb5c33f25546391c9a62cc735c5a6a6cb98ef97c61900d65154c5b44ab3d2 SHA512 f6b19b8e7dd80df8a162665d7c3dcc8f7d739fefcd1e6a1e8d588cbbf7de08240ef49c6542524bcd173f7150a1ff5d752a9c7532dc6a9b37954ea29928bf123c DIST icedtea-bin-core-3.14.0-ppc64le.tar.xz 55152852 BLAKE2B 198dffad2beefa5fed0fb0a9151ba68bf4f24e8dd1ff2a430983ecb72131d82119423eba6192365620731e030a58b60bb3492b34e2a87d19a58178c43e69853d SHA512 8ccfd5ba3ae3d0a7125b99c52db7ee37229f9071209e2011023398c3dd4746e7edda92f361427667739b298ee2d0debab4346cffbe6572f2729e59971ef7 +DIST icedtea-bin-core-3.14.0-x86.tar.xz 61674516 BLAKE2B 9297b3192985e1925f732c38229854781ebc61a49b487d147380c0fcd088601908f59488f8795f2c9069d103613785082f0fe4e227659fe3916d807a6622c3bf SHA512 ca61c53a1a424a059b4a0b2b8fea8fa2a8ab9cf1e3dc8f5600b89b29f280f71841a7b853bfd1e88d756211816e733aef8fb232fcfdebca85978cf50c9026f0fb DIST icedtea-bin-doc-3.13.0.tar.xz 11641004 BLAKE2B de8fbfe42a214276e1cbb60d4567c0d06b03078ff3db50611cce5a7381c67d0219e74ff53a63b900f6353b72ef8ec943d80c4271769a058cc191ae06f9615840 SHA512 2b786ed12424494dd4e8018b5a41a558517f2614cd6dc6f59fbf4b9be5afd94e76e0c3d0e5a170d61c2212570b9d68ca9b88728e5eacd4baf2448052d782c0dd DIST icedtea-bin-doc-3.14.0.tar.xz 11406340 BLAKE2B 249832aaa0093f70c8bfff78bfcbe6fe32c3e6210789e1f7993d24098d467fc0b5dba505b58135da82a3e55a357891a90a03eb8032b4c4db9af15d3c16915db9 SHA512 3665b702f25e548061970a1078c4f6fb6b412bbcf59391ad04850d64cc3a664357990ad55ef1ba0a7e1fd214b23e408ca59314ad79ca0736e0f1dd94d6f92ab8 DIST icedtea-bin-examples-3.13.0-amd64.tar.xz 1854064 BLAKE2B ca2b4fc55561843a081edd3de935f9f78f0ce072b22fa758caa6ff323182e1b295ed777d8550645c6f954f17dfbe8b932d008698b9767f2ac1cdee8b96c1a90f SHA512 906f9a83174898b47616428d797b2ea0c96c3f21a6b0c630895950292fe69ed6431aa3dd066e68e70bfd9f267e22620f1775505e0175b8ed43006c05715dbf76 @@ -16,9 +18,11 @@ DIST icedtea-bin-examples-3.13.0-arm64.tar.xz 1852148 BLAKE2B 1126bc4a17b3224640 DIST icedtea-bin-examples-3.13.0-ppc64.tar.xz 1865612 BLAKE2B
[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/imlate/
commit: 059b8857c2114f2ca0cec3ec5408d28ecc38ee62
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 2 17:50:31 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 2 21:24:54 2020 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=059b8857
imlate: Dynamically calculate column width in report
Also print categories on the line with the package name for much simpler
consumption by external tools.
Signed-off-by: Matt Turner gentoo.org>
pym/gentoolkit/imlate/imlate.py | 20 +---
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/pym/gentoolkit/imlate/imlate.py b/pym/gentoolkit/imlate/imlate.py
index 86d1a7e..40e2914 100755
--- a/pym/gentoolkit/imlate/imlate.py
+++ b/pym/gentoolkit/imlate/imlate.py
@@ -67,11 +67,18 @@ def _fill( width, line, fill = " " ):
# create a hopefully pretty result
def show_result( conf, pkgs ):
# X - len(colX) = space to fill
- col1 = 40
- col2 = 20
+ col1 = -1
+ col2 = -1
+ for cat in pkgs:
+ for pkg in pkgs[cat]:
+ col1 = max(col1, len(("%s/%s" % (cat, pkg
+ col2 = max(col2, len(pkgs[cat][pkg][1]))
+ col1 += 1
+ col2 += 1
_header = "%s candidates for 'gentoo' on '%s'"
- _helper = "category/package[:SLOT] our version
best version"
+ _helper = "%s%s%s" % (_fill(col1, "category/package[:SLOT])"),
+ _fill(col2, "our version"),
"best version")
_cand = ""
header = ""
@@ -102,11 +109,10 @@ def show_result( conf, pkgs ):
print(_fill( len( _helper ), "", "-" ), file=out)
for cat in sorted( pkgs.keys() ):
- print("%s/" % cat, file=out)
for pkg in sorted( pkgs[cat].keys() ):
- print("%s%s%s" % ( _fill( col1, ( " %s" % pkg ) ),
- _fill(
col2, pkgs[cat][pkg][1] ),
-
pkgs[cat][pkg][0] ), file=out)
+ print("%s%s%s" % (_fill(col1, ("%s/%s" % (cat, pkg))),
+ _fill(col2,
pkgs[cat][pkg][1]),
+ pkgs[cat][pkg][0] ),
file=out)
if conf["FILE"] != "stdout":
out.close()
[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/eclean/
commit: fba1039db46156089840896d3b6aa90076872d73
Author: Matt Turner gentoo org>
AuthorDate: Tue Dec 10 18:29:27 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Dec 10 18:42:44 2019 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=fba1039d
eclean: Fix typos
Signed-off-by: Matt Turner gentoo.org>
pym/gentoolkit/eclean/cli.py| 4 ++--
pym/gentoolkit/eclean/search.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pym/gentoolkit/eclean/cli.py b/pym/gentoolkit/eclean/cli.py
index 1d2f52b..1a99b3e 100644
--- a/pym/gentoolkit/eclean/cli.py
+++ b/pym/gentoolkit/eclean/cli.py
@@ -304,7 +304,7 @@ def parseArgs(options={}):
options['size-limit'] = 0
options['verbose'] = False
options['ignore-failure'] = False
- # if called by a well-named symlink, set the acction accordingly:
+ # if called by a well-named symlink, set the action accordingly:
action = None
# temp print line to ensure it is the svn/branch code running, etc..
#print( "## svn/branch/gentoolkit_eclean ### ==> ",
os.path.basename(sys.argv[0]))
@@ -400,7 +400,7 @@ def doAction(action,options,exclude={}, output=None):
)
# initialize our cleaner
- cleaner = CleanUp( output.progress_controller)
+ cleaner = CleanUp(output.progress_controller)
# actually clean files if something was found
if clean_me:
diff --git a/pym/gentoolkit/eclean/search.py b/pym/gentoolkit/eclean/search.py
index ce455a3..58bd97e 100644
--- a/pym/gentoolkit/eclean/search.py
+++ b/pym/gentoolkit/eclean/search.py
@@ -574,7 +574,7 @@ def findPackages(
del clean_me[cpv]
continue
if portage.cpv_getkey(cpv) in cp_all and
port_dbapi.cpv_exists(cpv):
- # exlusion because of --package-names
+ # exclusion because of --package-names
del clean_me[cpv]
# the getname method correctly supports FEATURES=binpkg-multi-instance,
[gentoo-commits] repo/gentoo:master commit in: profiles/arch/riscv/, profiles/arch/sparc/, profiles/arch/arm64/
commit: 91a40a0e84ba155102ff73a71f31f7efed3db84e Author: Matt Turner gentoo org> AuthorDate: Thu Jan 2 20:50:47 2020 + Commit: Matt Turner gentoo org> CommitDate: Fri Jan 3 04:30:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a40a0e profiles: Drop libglvnd entries for arches with keywords And drop the arm64 use.stable.mask entry, since the entry already exists in base/use.stable.mask. Signed-off-by: Matt Turner gentoo.org> profiles/arch/arm64/use.stable.mask | 4 profiles/arch/riscv/use.mask| 4 profiles/arch/sparc/use.mask| 4 3 files changed, 12 deletions(-) diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask index 215734be76b..10623ef3569 100644 --- a/profiles/arch/arm64/use.stable.mask +++ b/profiles/arch/arm64/use.stable.mask @@ -4,10 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Aaron Bauman (2019-12-27) -# not stable yet -libglvnd - # Aaron Bauman (2019-05-20) # Does not build on arm64 ocamlopt diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask index 621c5b39af2..31481e04a8c 100644 --- a/profiles/arch/riscv/use.mask +++ b/profiles/arch/riscv/use.mask @@ -4,10 +4,6 @@ # Unmask the flag which corresponds to ARCH. -riscv -# Matt Turner (2019-12-05) -# media-libs/libglvnd is not keyworded -libglvnd - # Sergei Trofimovich (2019-11-27) # valgrind has no RISCV port. valgrind diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask index bc533bd72fa..551f47e5f3f 100644 --- a/profiles/arch/sparc/use.mask +++ b/profiles/arch/sparc/use.mask @@ -4,10 +4,6 @@ # Unmask the flag which corresponds to ARCH. -sparc -# Matt Turner (2019-12-05) -# media-libs/libglvnd is not keyworded -libglvnd - # Mattéo Rossillol‑‑Laruelle (2019‑08‑31) # Dependency not keyworded (dev-libs/libappindicator). ayatana
[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/
commit: 3ca85cd6bbae5553f3077e61c740451be63ac44e
Author: Zac Medico gentoo org>
AuthorDate: Fri Jan 3 03:19:26 2020 +
Commit: Zac Medico gentoo org>
CommitDate: Fri Jan 3 03:23:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca85cd6
app-text/calibre: Bump to version 4.8.0
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Zac Medico gentoo.org>
app-text/calibre/Manifest | 1 +
app-text/calibre/calibre-4.8.0.ebuild | 273 ++
2 files changed, 274 insertions(+)
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 69e7574f245..dfccb2d318e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,3 +4,4 @@ DIST calibre-4.4.0.tar.xz 36389440 BLAKE2B
d6f6bfb98dd95012a7d145d7700a2818974b2
DIST calibre-4.5.0.tar.xz 36472092 BLAKE2B
b742f897b45e3832e5d8ebec93d8223973b6f5b6d6b3074a07e529eb4b823fa63cbf55c2d6b46ee7e0b5868dc45a858d0a841ce6b9a071ebc27a8977c44b00c6
SHA512
0d024ca7bda1ba9f2bb20fd02af1c4225d63c1a1e1bd71bf7760c214cec9ccf821fe31859cf389c6e45ba7fca21c706e5619f2066b600571f17660c52d84bd09
DIST calibre-4.6.0.tar.xz 37397188 BLAKE2B
145f329bb4dfeaffcc1a1dec741cf7f0d2bb943bc343f83828ad3755452c6313e59cc2e1518d8b05120746928080bc2c0de52827202c6a45733495bddf9995ed
SHA512
4a057ffa6a77dfcec99a7ac89caf98045e2884af5a2833aed232620bd668ce92f542c903ea3817cfc05bbdbf10d89be029a459924d889fc83c8151100779a70d
DIST calibre-4.7.0.tar.xz 37432756 BLAKE2B
5030bee02506c2051949c248a941289da7b4e6b48aa638abcf14ab9c56f6552b1043f85bc6fbae644e33843711ad11d03da4ac3a320cb7cf4590bc1d0bf92ed8
SHA512
852f3ff45cbf055571c47754b55b51607ede63865fe04263a9c8d5d59973eaa8c5da718f589d2b830567796f59d5bd5189c8e5e9455e3f98e879a37acb7174e3
+DIST calibre-4.8.0.tar.xz 37448552 BLAKE2B
416500da33c5a7e0bb84e521db757c1ba5c6e38f04c2b92ad08c2039c64a7c7cc6daddf379cffe120e966e856468cb99da6d80feab75c518a3218a2e07c9cfd9
SHA512
5ab2340d9f4a8e4592aa5929827513127830bca5830f4861db97699fe491845dd17018158dc7c143255ce57730bc9e5ba556ddebb033d18086d0e1901388f840
diff --git a/app-text/calibre/calibre-4.8.0.ebuild
b/app-text/calibre/calibre-4.8.0.ebuild
new file mode 100644
index 000..d15693e1393
--- /dev/null
+++ b/app-text/calibre/calibre-4.8.0.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,ssl"
+
+inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/;
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz;
+
+LICENSE="
+ GPL-3+
+ GPL-3
+ GPL-2+
+ GPL-2
+ GPL-1+
+ LGPL-3+
+ LGPL-2.1+
+ LGPL-2.1
+ BSD
+ MIT
+ Old-MIT
+ Apache-2.0
+ public-domain
+ || ( Artistic GPL-1+ )
+ CC-BY-3.0
+ OFL-1.1
+ PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=app-text/hunspell-1.7:=
+ >=app-text/podofo-0.9.6_pre20171027:=
+ >=app-text/poppler-0.26.5[qt5]
+ >=dev-libs/chmlib-0.40:=
+ dev-libs/glib:2=
+ dev-libs/hyphen:=
+ >=dev-libs/icu-57.1:=
+ dev-libs/libinput:=
+ >=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+ >=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+ >=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+ >=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+ >=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+ >=dev-libs/dbus-glib-0.106
+ >=sys-apps/dbus-1.10.8
+ dev-python/dnspython[${PYTHON_USEDEP}]
+ >=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+ >=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+ >=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+
>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+ >=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-qt/qtcore:5=
+ dev-qt/qtdbus:5=
+ dev-qt/qtgui:5=
+ >=dev-qt/qtwebengine-5.12
+ dev-qt/qtwidgets:5=
+ dev-util/desktop-file-utils
+ dev-util/gtk-update-icon-cache
+ media-fonts/liberation-fonts
+
[gentoo-commits] repo/gentoo:master commit in: dev-python/setuptools/
commit: 01c08c7924ba554f6df188b053cd377bb3469b17
Author: Aaron Bauman gentoo org>
AuthorDate: Fri Jan 3 02:42:38 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Fri Jan 3 02:42:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c08c79
dev-python/setuptools: arm64 stable (bug #704526)
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
dev-python/setuptools/setuptools-42.0.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-python/setuptools/setuptools-42.0.2.ebuild
b/dev-python/setuptools/setuptools-42.0.2.ebuild
index 9bee3995ddc..52978af2b64 100644
--- a/dev-python/setuptools/setuptools-42.0.2.ebuild
+++ b/dev-python/setuptools/setuptools-42.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~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 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of extensions to Distutils"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/usbguard/files/, sys-apps/usbguard/
commit: 418a356ac55fb3ac19acd269ec593ce436a0f456
Author: Sebastian Pipping gentoo org>
AuthorDate: Fri Jan 3 00:17:53 2020 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Fri Jan 3 00:22:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418a356a
sys-apps/usbguard: 0.7.6 (new package)
Revision 1 is used because 0.7.6(-r0) exists in Pentoo.
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
sys-apps/usbguard/Manifest | 1 +
.../files/usbguard-0.7.6-usbguard-dbus.openrc | 12
.../usbguard/files/usbguard-0.7.6-usbguard.openrc | 12
sys-apps/usbguard/metadata.xml | 8 +++
sys-apps/usbguard/usbguard-0.7.6-r1.ebuild | 81 ++
5 files changed, 114 insertions(+)
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
new file mode 100644
index 000..4929554c1e1
--- /dev/null
+++ b/sys-apps/usbguard/Manifest
@@ -0,0 +1 @@
+DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B
4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0
SHA512
0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
new file mode 100755
index 000..2c923123c18
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/usbguard-dbus"
+command_args="--system"
+command_background="true"
+pidfile="/run/usbguard-dbus.pid"
+
+depend() {
+need dbus usbguard
+}
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
new file mode 100755
index 000..3ea514cce16
--- /dev/null
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/usbguard-daemon"
+command_args="-k -c /etc/usbguard/usbguard-daemon.conf"
+command_background="true"
+pidfile="/run/usbguard.pid"
+
+depend() {
+need udev localmount
+}
diff --git a/sys-apps/usbguard/metadata.xml b/sys-apps/usbguard/metadata.xml
new file mode 100644
index 000..6d2298876fa
--- /dev/null
+++ b/sys-apps/usbguard/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ sp...@gentoo.org
+ Sebastian Pipping
+
+
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
new file mode 100644
index 000..ec5fcfb642d
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard;
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit systemd"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+CDEPEND="
+ dev-libs/pegtl
+ >=dev-libs/libsodium-0.4.5:=
+ >=dev-libs/protobuf-2.5.0:=
+ >=sys-cluster/libqb-0.16.0:=
+ sys-devel/gcc:*[cxx]
+ >=sys-libs/libcap-ng-0.7.0
+ >=sys-libs/libseccomp-2.0.0
+ >=sys-process/audit-2.7.7
+ bash-completion? ( >=app-shells/bash-completion-2.0 )
+ dbus? (
+ >=dev-libs/dbus-glib-0.100
+ dev-libs/glib:2
+ sys-apps/dbus
+ policykit? ( sys-auth/polkit[introspection] )
+ )
+ ldap? ( net-nds/openldap )
+ systemd? ( sys-apps/systemd )
+ "
+RDEPEND="${CDEPEND}
+ virtual/udev
+ "
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ dev-cpp/catch:1
+ dbus? (
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ )
+ "
+
+src_configure() {
+ local myargs=(
+ $(use_with dbus)
+ $(use_with ldap)
+ $(use_with policykit polkit)
+ $(use_enable systemd)
+ --disable-dependency-tracking
+ )
+
+ econf "${myargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /var/lib/log/usbguard
+
+ newinitd "${FILESDIR}"/${P}-usbguard.openrc usbguard
+ use dbus && newinitd "${FILESDIR}"/${P}-usbguard-dbus.openrc
usbguard-dbus
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn 'BEFORE STARTING
[gentoo-commits] proj/devmanual:master commit in: bin/
commit: bf62b78f01dd8676403b03af942c42a56a145625
Author: Göktürk Yüksek gentoo org>
AuthorDate: Thu Jan 2 23:56:26 2020 +
Commit: Göktürk Yüksek gentoo org>
CommitDate: Thu Jan 2 23:56:26 2020 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=bf62b78f
bin/build_search_documents.py: is a terminal node, not intermediary
Process as a terminal node.
Reported-by: Ulrich Müller gentoo.org>
Signed-off-by: Göktürk Yüksek gentoo.org>
bin/build_search_documents.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/build_search_documents.py b/bin/build_search_documents.py
index b7b840c..6782969 100755
--- a/bin/build_search_documents.py
+++ b/bin/build_search_documents.py
@@ -83,10 +83,10 @@ def process_node(documents: list, node: ET.Element, name:
str, url: str) -> None
for child in node:
process_node(documents, child, name, url)
-elif node.tag in ['body', 'dl', 'guide', 'li', 'ul', 'table', 'tr']:
+elif node.tag in ['body', 'dl', 'guide', 'ul', 'table', 'tr']:
for child in node:
process_node(documents, child, name, url)
-elif node.tag in ['p', 'dd', 'dt', 'important', 'note', 'warning', 'th',
'ti']:
+elif node.tag in ['p', 'dd', 'dt', 'important', 'li', 'note', 'warning',
'th', 'ti']:
text = stringify_node(node)
documents.append({'id': len(documents),
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs-fast-export/
commit: 144e8aa77288b43bd6984d50e938bae0ea6ce4a7
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Jan 2 22:41:40 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Jan 2 22:42:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=144e8aa7
dev-vcs/cvs-fast-export: drop old
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-vcs/cvs-fast-export/Manifest | 1 -
.../cvs-fast-export/cvs-fast-export-1.47.ebuild| 48 --
2 files changed, 49 deletions(-)
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index a80a366cea5..4e20bd8db2a 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,4 +1,3 @@
-DIST cvs-fast-export-1.47.tar.gz 522489 BLAKE2B
5f83524137b38f863287feef9f95074dd40bc2189420abcf4d04cd02d686e21cc7fb26bf1e5fc3736efb04fe2e97202f1b4112483f420c7609fb208984c21095
SHA512
0da4b6d27e93c3bcf8ee0669acb0f15973f6eb3c566fd843755ac1176315220a23813d8ed72eba6f7429fa8ce5c00ed99d22fd9dd14e438473ff0a63c2d20cac
DIST cvs-fast-export-1.48.tar.gz 524991 BLAKE2B
d26cf7dfe07eacdf21f9a3627b12548acaf2d5fc3b1c871d4f91a8ddc1bdde621a6ed2eb93e57869a2cf5507e396fcc22d5ef800bb6966f4ad8488b6ebff5b4c
SHA512
6a8398bed512abac1e8d5dffcb1fed14d5a0170f45a43f16dbde9fcfd068dc921cc22510a8d4d11ae9266a336da60a0dba33789aa447c013c5a800bf21055d7a
DIST cvs-fast-export-1.49.tar.gz 446347 BLAKE2B
0b26ed771eec6320a6fc9def82e10dc82bb66f166b07d900cfbae89780bbdd783d0f7fb2d56c780d4ed788a2c07f41943f1b7f84394b5376dd10175f86384482
SHA512
24630c68af954b5f6051aca5d3af9e440189a2a062c8519892cc3a2d977f650a6ba340031f978555fbf9613cf7f9f5cea766f89d3f0ad34f188a4562a0d507f4
DIST cvs-fast-export-1.50.tar.gz 440789 BLAKE2B
86c9f582090601fe97c98eaadf927902dbc8b0351a02bed3b1eca77c75641495bf2e457db3d75f058ccfc7f36c8800d59d53c3bd4abccf46fffbe324626273c5
SHA512
29c0e3e87917e5f11a7be318240bf80327a5f46b796d9fcbb6a6fd4fadc91fac924d60a74de80559d4c2713021b8a8a518e2dcae7594928e1d040f2c8614065b
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild
b/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild
deleted file mode 100644
index 50babdf251f..000
--- a/dev-vcs/cvs-fast-export/cvs-fast-export-1.47.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="fast-export history from a CVS repository or RCS collection"
-HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/;
-SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- app-text/asciidoc"
-
-RESTRICT=test # upstream does not ship some tests in tarball
-
-src_prepare() {
- default
-
- tc-export CC
- export prefix=/usr
-
- # respect CC, CFLAGS and LDFLAGS
- sed \
- -e 's/cc /$(CC) $(LDFLAGS) /' \
- -e 's/^CFLAGS += -O/#&/' \
- -e 's/CFLAGS=/CFLAGS+=/' \
- -i Makefile || die
-}
-
-src_compile() {
- # '.adoc.html' rules can't be executed in parallel
- # as they reuse the same 'docbook-xsl.css' file name.
- emake -j1 html
- # Allow full parallelism for the rest
- emake
-}
-
-src_install() {
- default
- dodoc README.adoc
-}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/cvs-fast-export/
commit: 75dee4d5cc2eb81c9abdcd013bab7b14f43bbfde
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Jan 2 22:41:14 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Jan 2 22:42:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75dee4d5
dev-vcs/cvs-fast-export: bump up to 1.50
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-vcs/cvs-fast-export/Manifest | 1 +
.../cvs-fast-export/cvs-fast-export-1.50.ebuild| 48 ++
2 files changed, 49 insertions(+)
diff --git a/dev-vcs/cvs-fast-export/Manifest b/dev-vcs/cvs-fast-export/Manifest
index 0a123163200..a80a366cea5 100644
--- a/dev-vcs/cvs-fast-export/Manifest
+++ b/dev-vcs/cvs-fast-export/Manifest
@@ -1,3 +1,4 @@
DIST cvs-fast-export-1.47.tar.gz 522489 BLAKE2B
5f83524137b38f863287feef9f95074dd40bc2189420abcf4d04cd02d686e21cc7fb26bf1e5fc3736efb04fe2e97202f1b4112483f420c7609fb208984c21095
SHA512
0da4b6d27e93c3bcf8ee0669acb0f15973f6eb3c566fd843755ac1176315220a23813d8ed72eba6f7429fa8ce5c00ed99d22fd9dd14e438473ff0a63c2d20cac
DIST cvs-fast-export-1.48.tar.gz 524991 BLAKE2B
d26cf7dfe07eacdf21f9a3627b12548acaf2d5fc3b1c871d4f91a8ddc1bdde621a6ed2eb93e57869a2cf5507e396fcc22d5ef800bb6966f4ad8488b6ebff5b4c
SHA512
6a8398bed512abac1e8d5dffcb1fed14d5a0170f45a43f16dbde9fcfd068dc921cc22510a8d4d11ae9266a336da60a0dba33789aa447c013c5a800bf21055d7a
DIST cvs-fast-export-1.49.tar.gz 446347 BLAKE2B
0b26ed771eec6320a6fc9def82e10dc82bb66f166b07d900cfbae89780bbdd783d0f7fb2d56c780d4ed788a2c07f41943f1b7f84394b5376dd10175f86384482
SHA512
24630c68af954b5f6051aca5d3af9e440189a2a062c8519892cc3a2d977f650a6ba340031f978555fbf9613cf7f9f5cea766f89d3f0ad34f188a4562a0d507f4
+DIST cvs-fast-export-1.50.tar.gz 440789 BLAKE2B
86c9f582090601fe97c98eaadf927902dbc8b0351a02bed3b1eca77c75641495bf2e457db3d75f058ccfc7f36c8800d59d53c3bd4abccf46fffbe324626273c5
SHA512
29c0e3e87917e5f11a7be318240bf80327a5f46b796d9fcbb6a6fd4fadc91fac924d60a74de80559d4c2713021b8a8a518e2dcae7594928e1d040f2c8614065b
diff --git a/dev-vcs/cvs-fast-export/cvs-fast-export-1.50.ebuild
b/dev-vcs/cvs-fast-export/cvs-fast-export-1.50.ebuild
new file mode 100644
index 000..91e884f274b
--- /dev/null
+++ b/dev-vcs/cvs-fast-export/cvs-fast-export-1.50.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="fast-export history from a CVS repository or RCS collection"
+HOMEPAGE="http://www.catb.org/~esr/cvs-fast-export/;
+SRC_URI="http://www.catb.org/~esr/${PN}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ app-text/asciidoc"
+
+RESTRICT=test # upstream does not ship some tests in tarball
+
+src_prepare() {
+ default
+
+ tc-export CC
+ export prefix=/usr
+
+ # respect CC, CFLAGS and LDFLAGS
+ sed \
+ -e 's/cc /$(CC) $(LDFLAGS) /' \
+ -e 's/^CFLAGS += -O/#&/' \
+ -e 's/CFLAGS=/CFLAGS+=/' \
+ -i Makefile || die
+}
+
+src_compile() {
+ # '.adoc.html' rules can't be executed in parallel
+ # as they reuse the same 'docbook-xsl.css' file name.
+ emake -j1 html
+ # Allow full parallelism for the rest
+ emake
+}
+
+src_install() {
+ default
+ dodoc README.adoc
+}
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: edadf8f5674abee2e022d69a356d31a83a3dfcce
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:11:56 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 22:36:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edadf8f5
cmake.eclass: Ban CMAKE_MIN_VERSION for real
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 4a52cd9ea25..93ede2588c8 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -103,6 +103,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic
multiprocessing xdg-utils
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary,
set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly"
[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set
CMAKE_REMOVE_MODULES_LIST=\"\" instead"
[[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY
instead"
[gentoo-commits] repo/gentoo:master commit in: app-text/liblangtag/
commit: 7e952a24854aeee2311fd53672137d2c84fe540a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 21:35:54 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 22:36:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e952a24
app-text/liblangtag: Move test dep to DEPEND where it belongs
Thanks-to: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-text/liblangtag/liblangtag-0.6.3.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild
b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index b0db495d30f..eb55dea03ec 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -18,13 +18,14 @@ BDEPEND="
sys-devel/gettext
doc? ( dev-util/gtk-doc )
introspection? ( dev-libs/gobject-introspection-common )
- test? ( dev-libs/check )
"
RDEPEND="
dev-libs/libxml2
introspection? ( dev-libs/gobject-introspection )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check )
+"
# Upstream expect liblangtag to be installed when one runs tests...
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
commit: 088d47495b72cf9d001f170887ad1e574b01da97
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 22:35:56 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 22:36:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088d4749
media-gfx/gmic: Revert back to cmake-utils.eclass
Sorry for breaking. It is weird, but not for me to figure out.
Bug: https://bugs.gentoo.org/704524
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/gmic/gmic-2.7.0.ebuild | 28 +++-
media-gfx/gmic/gmic-2.7.1.ebuild | 28 +++-
media-gfx/gmic/gmic-2.7.2.ebuild | 28 +++-
3 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
index a96eb924674..1edb9254ff0 100644
--- a/media-gfx/gmic/gmic-2.7.0.ebuild
+++ b/media-gfx/gmic/gmic-2.7.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/dtschump/gmic.git;
@@ -79,14 +81,14 @@ pkg_pretend() {
src_prepare() {
local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
- cmake_src_prepare
+ cmake-utils_src_prepare
sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
if use gimp || use krita || use qt5; then
sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt ||
die
local S="${S}/gmic-qt"
PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
- cmake_src_prepare
+ cmake-utils_src_prepare
fi
}
@@ -113,7 +115,7 @@ src_configure() {
-DENABLE_DYNAMIC_LINKING=ON
)
- cmake_src_configure
+ cmake-utils_src_configure
# configure gmic-qt frontends
local CMAKE_USE_DIR="${S}/gmic-qt"
@@ -126,32 +128,32 @@ src_configure() {
if use gimp; then
mycmakeargs+=( -DGMIC_QT_HOST=gimp )
- BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+ BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
fi
if use krita; then
mycmakeargs+=( -DGMIC_QT_HOST=krita )
- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+ BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
fi
if use qt5; then
mycmakeargs+=( -DGMIC_QT_HOST=none )
- BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+ BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
fi
}
src_compile() {
- cmake_src_compile
+ cmake-utils_src_compile
# build gmic-qt frontends
local S="${S}/gmic-qt"
- use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die
"failed building gimp plugin" ; }
- use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die
"failed building krita plugin" ; }
- use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die
"failed building qt5 GUI" ; }
+ use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile ||
die "failed building gimp plugin" ; }
+ use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile
|| die "failed building krita plugin" ; }
+ use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile ||
die "failed building qt5 GUI" ; }
}
src_install() {
- cmake_src_install
+ cmake-utils_src_install
dodoc README
use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh
${PN}
diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
index 81708eba2f7..2a575ef1eb6 100644
--- a/media-gfx/gmic/gmic-2.7.1.ebuild
+++ b/media-gfx/gmic/gmic-2.7.1.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CMAKE_BUILD_TYPE=Release
-inherit cmake bash-completion-r1
+CMAKE_MIN_VERSION=3.9
+
+inherit cmake-utils bash-completion-r1
if [[ ${PV} == "" ]]; then
EGIT_REPO_URI="https://github.com/dtschump/gmic.git;
@@ -79,14 +81,14 @@ pkg_pretend() {
src_prepare() {
local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
- cmake_src_prepare
+ cmake-utils_src_prepare
sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
if use gimp || use krita || use qt5; then
sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt ||
die
local S="${S}/gmic-qt"
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/libqb/
commit: 7e5e69bf829c1d7972ad069d415f24937417ffa4
Author: Sebastian Pipping gentoo org>
AuthorDate: Thu Jan 2 21:38:41 2020 +
Commit: Sebastian Pipping gentoo org>
CommitDate: Thu Jan 2 21:44:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5e69bf
sys-cluster/libqb: 1.9.0
Bug: https://bugs.gentoo.org/704514
Bug: https://bugs.gentoo.org/699860
Signed-off-by: Sebastian Pipping gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
sys-cluster/libqb/Manifest | 1 +
sys-cluster/libqb/libqb-1.9.0.ebuild | 62
2 files changed, 63 insertions(+)
diff --git a/sys-cluster/libqb/Manifest b/sys-cluster/libqb/Manifest
index 61ac9d1299a..65dd7711761 100644
--- a/sys-cluster/libqb/Manifest
+++ b/sys-cluster/libqb/Manifest
@@ -1,3 +1,4 @@
DIST libqb-0.17.2.tar.xz 373540 BLAKE2B
b9d751fca21cc25798a24207740b14722502cbb918cc652cd33b0159a9bd1254a8a64bc73684ae3274a2cf346db5b19924cf010ba487f4c6a9a5f9deade792c4
SHA512
9c6dce7d18aa4da31594faecd0ea2737c2beefa749290094f733fe89ac40f094ec6409f310c534b8144d500e8c204c328386eaf1029995698d7019c014433443
DIST libqb-1.0.1.tar.xz 438204 BLAKE2B
be4d4dbe624721a6434f7e3023bcaef017e1358f67fa308e4107bd96469675eca51b5787f498857d22104e3ffa55ded9c44fe320c37fec639a84648c1f517223
SHA512
9afdf5b7064f4e79f70e3c21d1ae954d1444d202d5903bd84866e502b2afc218d4a84fd21fab637a198357e1dad5da94814a6c0bdaa0ba6ac4a24ff40422c185
DIST libqb-1.0.5.tar.xz 488516 BLAKE2B
96f61ce681d0c259e8df38f35c04349ab3b1199f62c2311d60c6f229bf15e8f62825c965a4847cbda4701119fc7ae3c68cc3a7187f927f8ddf7496cf1931c7c2
SHA512
a695bc4c913a32d47535cb2d8812f14a39732cae32651521a8f7b6d05c4202bfc28a477c88875bbfbe1a0238cd33f1fe64f2d2217b0c27cf11acf7233fc2cbdf
+DIST libqb-1.9.0.tar.gz 225147 BLAKE2B
d8200d5eec8c05a18675de585e2f85694d3d062d82afca38c421859e3e0287d1691fe9726a75d3726afc58a94765f6a201f8fb51bf1ed25c1cfeaeb326e6f6d0
SHA512
9bdf2087f610a7a02b976312d60391e1c53ebd3f36a897cdc3fcf818f666f772d63386b52bd11ed4e5ea52fa4775231ab7125359a270451f925b3821d9b8e3ee
diff --git a/sys-cluster/libqb/libqb-1.9.0.ebuild
b/sys-cluster/libqb/libqb-1.9.0.ebuild
new file mode 100644
index 000..6ae629bdc2f
--- /dev/null
+++ b/sys-cluster/libqb/libqb-1.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Library providing high performance logging, tracing, ipc, and
poll"
+HOMEPAGE="https://github.com/ClusterLabs/libqb;
+
+# Avoiding release tarball due to
https://github.com/ClusterLabs/libqb/issues/375
+# Please re-add ChangeLog to DOCS when switching back
+SRC_URI="https://github.com/ClusterLabs/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/20"
+KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug doc examples systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ test? ( dev-libs/check )
+ doc? ( app-doc/doxygen[dot] )"
+
+DOCS=( README.markdown )
+
+src_prepare() {
+ default
+
+ # Skip installation of text documents without value
+ sed -e '/dist_doc_DATA/d' -i Makefile.am || die
+
+ # Do not append version suffix "-yank"
+ sed 's|1-yank|1|' -i configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable systemd systemd-journal) \
+ $(use_enable debug)
+}
+
+src_compile() {
+ default
+ use doc && emake doxygen
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+
+ if use examples ; then
+ docinto examples
+ dodoc examples/*.c
+ fi
+
+ use doc && HTML_DOCS=("docs/html/.")
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: virtual/linux-sources/
commit: 7cc3472b1bbd63b2a7afb760961e1d25708fe683
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 21:30:08 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 21:32:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc3472b
virtual/linux-sources: Permit vanilla-kernel as sources provider
While vanilla-kernel does not install full kernel sources, it provides
enough files to build kernel modules. Add it to the list to avoid
meaninglessly pulling another sources.
Signed-off-by: Michał Górny gentoo.org>
.../{linux-sources-3-r1.ebuild => linux-sources-3-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/virtual/linux-sources/linux-sources-3-r1.ebuild
b/virtual/linux-sources/linux-sources-3-r2.ebuild
similarity index 90%
rename from virtual/linux-sources/linux-sources-3-r1.ebuild
rename to virtual/linux-sources/linux-sources-3-r2.ebuild
index e3959f883fd..d8bca86e677 100644
--- a/virtual/linux-sources/linux-sources-3-r1.ebuild
+++ b/virtual/linux-sources/linux-sources-3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,4 +23,5 @@ RDEPEND="
sys-kernel/zen-sources
sys-kernel/aufs-sources
sys-kernel/raspberrypi-sources
+ sys-kernel/vanilla-kernel
)"
[gentoo-commits] proj/portage-utils:master commit in: tests/
commit: 68712a990b7ec0111d0f82019aed36c3ba5c11c2
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 21:25:09 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 21:25:09 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=68712a99
tests: fix retrieving test name
Signed-off-by: Fabian Groffen gentoo.org>
tests/init.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/init.sh.in b/tests/init.sh.in
index c5cd8f3..7f5db06 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -35,7 +35,7 @@ q -i -q
# used by Travis segfaults on qmanifest, so disable there to be able to
# run the rest regularly
dovalgrind=${Q_RUN_WITH_VALGRIND}
-[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind=
+[[ ${TRAVIS_OS_NAME}:${as##*/} == linux:qmanifest ]] && dovalgrind=
if [[ -n ${dovalgrind} ]] ; then
chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
for f in @abs_top_builddir@/q?* ; do
[gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/
commit: d6e308a8a2831b454c8aadcbb269690d65e2a3d6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 21:02:24 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 21:02:24 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d6e308a8
kde-plasma/kinfocenter: Sorting
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-plasma/kinfocenter/kinfocenter-.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kde-plasma/kinfocenter/kinfocenter-.ebuild
b/kde-plasma/kinfocenter/kinfocenter-.ebuild
index 8a16272880..a43e2520e2 100644
--- a/kde-plasma/kinfocenter/kinfocenter-.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-.ebuild
@@ -22,6 +22,10 @@ REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
BDEPEND=">=dev-util/cmake-3.14.3"
COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -38,10 +42,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
x11-libs/libX11
ieee1394? ( sys-libs/libraw1394 )
opengl? (
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 23bc7197cc2377e86efaf8a9d7f67f4a6d703d90
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 21:06:16 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 21:06:16 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=23bc7197
cmake.eclass: CMAKE_MIN_VERSION porting instructions
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index 35745def4b..65a7664226 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -103,7 +103,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic
multiprocessing xdg-utils
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
-[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION has been removed and is a
no-op"
+[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION is banned; if necessary,
set BDEPEND=\">=dev-util/cmake-${CMAKE_MIN_VERSION}\" directly"
[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set
CMAKE_REMOVE_MODULES_LIST=\"\" instead"
[[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY
instead"
[gentoo-commits] proj/tatt:master commit in: templates/
commit: a6f188af2dd06082b26db38d9eeffa7cd6aba38b
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Thu Jan 2 20:59:10 2020 +
Commit: Rolf Eike Beer sf-mail de>
CommitDate: Thu Jan 2 21:00:24 2020 +
URL:https://gitweb.gentoo.org/proj/tatt.git/commit/?id=a6f188af
collect more test logs
Signed-off-by: Rolf Eike Beer sf-mail.de>
templates/tatt_functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/tatt_functions.sh b/templates/tatt_functions.sh
index d2b5bc8..57d3d65 100644
--- a/templates/tatt_functions.sh
+++ b/templates/tatt_functions.sh
@@ -34,7 +34,7 @@ function tatt_pkg_error
LOGNAME=$(mktemp -p "${TATT_BUILDLOGDIR}"
"${CP/\//_}_${TATT_TEST_TYPE}_X")
mv "${BUILDLOG}" "${LOGNAME}"
echo "log has been saved as ${LOGNAME}" >> "${TATT_REPORTFILE}"
-TESTLOGS=($(find ${BUILDDIR}/work -name test-suite.log -o -name
testsuite.log -o -name LastTest.log))
+TESTLOGS=($(find ${BUILDDIR}/work -iname '*test*log*'))
if [ ${#TESTLOGS[@]} -gt 0 ]; then
tar cf ${LOGNAME}.tar ${TESTLOGS[@]}
echo "testsuite logs have been saved as ${LOGNAME}.tar" >>
"${TATT_REPORTFILE}"
[gentoo-commits] proj/kde:master commit in: eclass/
commit: 2294814a906848f47a0a3869a721826962504c3a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:11:56 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 20:11:56 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2294814a
cmake.eclass: Ban CMAKE_MIN_VERSION for real
Signed-off-by: Andreas Sturmlechner gentoo.org>
eclass/cmake.eclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass
index b95f000302..35745def4b 100644
--- a/eclass/cmake.eclass
+++ b/eclass/cmake.eclass
@@ -103,6 +103,7 @@ inherit toolchain-funcs ninja-utils flag-o-matic
multiprocessing xdg-utils
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+[[ ${CMAKE_MIN_VERSION} ]] && die "CMAKE_MIN_VERSION has been removed and is a
no-op"
[[ ${CMAKE_BUILD_DIR} ]] && die "The ebuild must be migrated to BUILD_DIR"
[[ ${CMAKE_REMOVE_MODULES} ]] && die "CMAKE_REMOVE_MODULES is banned, set
CMAKE_REMOVE_MODULES_LIST=\"\" instead"
[[ ${CMAKE_UTILS_QA_SRC_DIR_READONLY} ]] && die "Use CMAKE_QA_SRC_DIR_READONLY
instead"
[gentoo-commits] proj/kde:master commit in: kde-apps/ark/
commit: 658d91ba40f5c82917ac3044fb476c5a492b5962
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:41:09 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 20:41:09 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=658d91ba
kde-apps/ark: Drop unused DEPEND
Upstream commit c6f81eb575ed1a5987badfa29ad294c38f1456d1
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/ark/ark-.ebuild | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/kde-apps/ark/ark-.ebuild b/kde-apps/ark/ark-.ebuild
index 8c4eaa406d..c393a14acd 100644
--- a/kde-apps/ark/ark-.ebuild
+++ b/kde-apps/ark/ark-.ebuild
@@ -23,6 +23,10 @@ BDEPEND="
sys-devel/gettext
"
RDEPEND="
+ app-arch/libarchive:=[bzip2?,lzma?,zlib]
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -31,7 +35,6 @@ RDEPEND="
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
@@ -40,10 +43,6 @@ RDEPEND="
>=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- app-arch/libarchive:=[bzip2?,lzma?,zlib]
sys-libs/zlib
zip? ( >=dev-libs/libzip-1.2.0:= )
"
[gentoo-commits] proj/kde:master commit in: kde-plasma/kinfocenter/
commit: 5e82e2fae3f72c20372d1278a8f7ae3b1707c6a9
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:10:31 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 20:10:31 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e82e2fa
kde-plasma/kinfocenter: Drop CMAKE_MIN_VERSION
BDEPEND on >=dev-util/cmake-3.14.3 directly.
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-plasma/kinfocenter/kinfocenter-5.17.49..ebuild | 12 ++--
kde-plasma/kinfocenter/kinfocenter-.ebuild | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.49..ebuild
b/kde-plasma/kinfocenter/kinfocenter-5.17.49..ebuild
index ac12a09f39..42f51acc1b 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.17.49..ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.17.49..ebuild
@@ -3,7 +3,6 @@
EAPI=7
-CMAKE_MIN_VERSION=3.14.3
ECM_HANDBOOK="forceoptional"
KFMIN=5.64.0
PVCUT=$(ver_cut 1-3)
@@ -20,7 +19,12 @@ IUSE="gles2 ieee1394 +opengl +pci wayland"
REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+BDEPEND=">=dev-util/cmake-3.14.3"
COMMON_DEPEND="
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -37,10 +41,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
>=kde-frameworks/solid-${KFMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
x11-libs/libX11
ieee1394? ( sys-libs/libraw1394 )
opengl? (
@@ -58,8 +58,8 @@ DEPEND="${COMMON_DEPEND}
>=kde-frameworks/plasma-${KFMIN}:5
"
RDEPEND="${COMMON_DEPEND}
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
"
src_configure() {
diff --git a/kde-plasma/kinfocenter/kinfocenter-.ebuild
b/kde-plasma/kinfocenter/kinfocenter-.ebuild
index 9b5b7d202c..8a16272880 100644
--- a/kde-plasma/kinfocenter/kinfocenter-.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-.ebuild
@@ -3,7 +3,6 @@
EAPI=7
-CMAKE_MIN_VERSION=3.14.3
ECM_HANDBOOK="forceoptional"
KFMIN=
PVCUT=$(ver_cut 1-3)
@@ -21,6 +20,7 @@ IUSE="gles2 ieee1394 +opengl +pci wayland"
REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
+BDEPEND=">=dev-util/cmake-3.14.3"
COMMON_DEPEND="
>=kde-frameworks/kcmutils-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -59,8 +59,8 @@ DEPEND="${COMMON_DEPEND}
>=kde-frameworks/plasma-${KFMIN}:5
"
RDEPEND="${COMMON_DEPEND}
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-plasma/kde-cli-tools-${PVCUT}:5
"
src_configure() {
[gentoo-commits] proj/kde:master commit in: media-gfx/digikam/
commit: 841baf53b2f9f86b9d1a37bd6d4441a1b1d137a8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 2 20:09:43 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 2 20:09:43 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=841baf53 media-gfx/digikam: Drop CMAKE_MIN_VERSION BDEPEND on >=dev-util/cmake-3.14.3 directly. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/digikam/digikam-.ebuild b/media-gfx/digikam/digikam-.ebuild index 954a99b061..31cb7a11c7 100644 --- a/media-gfx/digikam/digikam-.ebuild +++ b/media-gfx/digikam/digikam-.ebuild @@ -3,7 +3,6 @@ EAPI=7 -CMAKE_MIN_VERSION=3.14.3 KFMIN=5.60.0 QTMIN=5.12.3 inherit ecm kde.org toolchain-funcs @@ -26,6 +25,7 @@ SLOT="5" IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" BDEPEND=" + >=dev-util/cmake-3.14.3 sys-devel/gettext panorama? ( sys-devel/bison
[gentoo-commits] proj/kde:master commit in: kde-apps/kio-extras/
commit: 41511d8ce499ae38871e1bd5524d121a8408b9cc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:18:13 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 20:33:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=41511d8c
kde-apps/kio-extras: Add USE X for XCursor thumbnail support
Upstream commit 55d370392efa7d114cca648bde4109453fa760f8
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/kio-extras/kio-extras-.ebuild | 7 ++-
kde-apps/kio-extras/metadata.xml | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/kde-apps/kio-extras/kio-extras-.ebuild
b/kde-apps/kio-extras/kio-extras-.ebuild
index be39d7a0be..571cfcb404 100644
--- a/kde-apps/kio-extras/kio-extras-.ebuild
+++ b/kde-apps/kio-extras/kio-extras-.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://cgit.kde.org/kio-extras.git;
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
KEYWORDS=""
-IUSE="activities +man mtp openexr phonon samba +sftp taglib"
+IUSE="activities +man mtp openexr phonon samba +sftp taglib X"
BDEPEND="
man? ( dev-util/gperf )
@@ -57,6 +57,10 @@ DEPEND="
samba? ( net-fs/samba[client] )
sftp? ( net-libs/libssh:=[sftp] )
taglib? ( >=media-libs/taglib-1.11.1 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ )
"
RDEPEND="${DEPEND}
>=kde-frameworks/kded-${KFMIN}:5
@@ -76,6 +80,7 @@ src_configure() {
$(cmake_use_find_package samba Samba)
$(cmake_use_find_package sftp libssh)
$(cmake_use_find_package taglib Taglib)
+ $(cmake_use_find_package X X11)
)
ecm_src_configure
diff --git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index c061429499..9b496ae220 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -11,5 +11,6 @@
Enable file audio preview plugin using
media-libs/phonon
Enable SFTP protocol support using
net-libs/libssh
Enable audio thumbnails via
media-libs/taglib
+ Enable support for XCursor thumbnails via
x11-libs/libX11
[gentoo-commits] proj/portage-utils:master commit in: tests/
commit: b9051664bb3c37b2894d94cf655adfdae7862bf8
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 20:47:54 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 20:47:54 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b9051664
tests: workound env issue on Travis
Signed-off-by: Fabian Groffen gentoo.org>
tests/init.sh.in | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/init.sh.in b/tests/init.sh.in
index 8f52086..c5cd8f3 100644
--- a/tests/init.sh.in
+++ b/tests/init.sh.in
@@ -31,8 +31,12 @@ export TZ='UTC 0'
# create symlinks for applets
q -i -q
-# inject valgrind wrapper if necessary
-if [[ -n ${Q_RUN_WITH_VALGRIND} ]] ; then
+# inject valgrind wrapper if necessary, unfortunately valgrind on Ubuntu
+# used by Travis segfaults on qmanifest, so disable there to be able to
+# run the rest regularly
+dovalgrind=${Q_RUN_WITH_VALGRIND}
+[[ ${TRAVIS_OS_NAME}:${a} == linux:qmanifest ]] && dovalgrind=
+if [[ -n ${dovalgrind} ]] ; then
chmod 755 "@abs_top_srcdir@/tests/valgrind-wrapper/qvalgrind"
for f in @abs_top_builddir@/q?* ; do
[[ -L ${f} ]] || continue
[gentoo-commits] repo/gentoo:master commit in: media-libs/libglvnd/
commit: c845349a91877fdbb14bf5db8da4445c1e493682
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 2 20:47:36 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 2 20:48:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c845349a
media-libs/libglvnd-1.3.0: add ~sparc, bug 702132
Signed-off-by: Matt Turner gentoo.org>
media-libs/libglvnd/libglvnd-1.3.0.ebuild | 2 +-
media-libs/libglvnd/libglvnd-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
index 49a9c99cac8..a2bad37b6ce 100644
--- a/media-libs/libglvnd/libglvnd-1.3.0.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd;
if [[ ${PV} = * ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
-> ${P}.tar.bz2"
S=${WORKDIR}/${PN}-v${PV}
fi
diff --git a/media-libs/libglvnd/libglvnd-.ebuild
b/media-libs/libglvnd/libglvnd-.ebuild
index b98a84b1e5a..8438b84a526 100644
--- a/media-libs/libglvnd/libglvnd-.ebuild
+++ b/media-libs/libglvnd/libglvnd-.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd;
if [[ ${PV} = * ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86"
SRC_URI="https://gitlab.freedesktop.org/glvnd/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2
-> ${P}.tar.bz2"
S=${WORKDIR}/${PN}-v${PV}
fi
[gentoo-commits] repo/gentoo:master commit in: games-util/xboxdrv/
commit: b71061837cf82bd460aad41a0018488b0a7b302e
Author: Joonas Niilola gentoo org>
AuthorDate: Thu Jan 2 07:40:27 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Jan 2 20:32:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7106183
games-util/xboxdrv: add python-3.7 support
Signed-off-by: Joonas Niilola gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14214
Signed-off-by: James Le Cuirot gentoo.org>
games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
index e72f053eabf..1508c02753d 100644
--- a/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
+++ b/games-util/xboxdrv/xboxdrv-0.8.8_p20190118.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
inherit linux-info python-any-r1 scons-utils toolchain-funcs systemd udev
[gentoo-commits] repo/gentoo:master commit in: app-crypt/rhash/, app-crypt/rhash/files/
commit: b29a8eee6d90f689232342e632c2418421217649
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Jan 2 20:38:38 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Jan 2 20:38:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29a8eee
app-crypt/rhash: Apply upstream patch to fix 1.3.9 -rc segfault
Bug: https://github.com/rhash/RHash/issues/104
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: James Le Cuirot gentoo.org>
.../rhash/files/rhash-1.3.9-rc-segfault.patch | 25 ++
.../{rhash-1.3.9.ebuild => rhash-1.3.9-r1.ebuild} | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
b/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
new file mode 100644
index 000..90a1efecbb1
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
@@ -0,0 +1,25 @@
+From 198e62063ed817357204284a15f95ffc7230044c Mon Sep 17 00:00:00 2001
+From: Aleksey
+Date: Thu, 2 Jan 2020 21:16:51 +0300
+Subject: [PATCH] fix segfault on rhash -rc
+
+---
+ file.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/file.c b/file.c
+index 6f593f9..0d18f45 100644
+--- a/file.c
b/file.c
+@@ -361,8 +361,9 @@ int file_init_by_print_path(file_t* file, file_t*
prepend_dir, const char* print
+ const char* path = make_path(prepend_dir->real_path,
print_path, 0);
+ file_init(file, path, init_flags & ~FileInitReusePath);
+ }
+- if (!prepend_dir || IS_DOT_STR(prepend_dir->print_path) ||
+- (!prepend_dir->print_path && opt.path_separator !=
ALIEN_PATH_SEPARATOR)) {
++ if (!prepend_dir || (prepend_dir->print_path ?
++ IS_DOT_STR(prepend_dir->print_path) :
++ opt.path_separator != ALIEN_PATH_SEPARATOR)) {
+ if ((init_flags & FileInitReusePath) != 0) {
+ file->print_path = print_path;
+ file->mode |= FileDontFreePrintPath;
diff --git a/app-crypt/rhash/rhash-1.3.9.ebuild
b/app-crypt/rhash/rhash-1.3.9-r1.ebuild
similarity index 95%
rename from app-crypt/rhash/rhash-1.3.9.ebuild
rename to app-crypt/rhash/rhash-1.3.9-r1.ebuild
index 2d4c3303cd5..e203d68814e 100644
--- a/app-crypt/rhash/rhash-1.3.9.ebuild
+++ b/app-crypt/rhash/rhash-1.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -32,6 +32,7 @@ S="${WORKDIR}/RHash-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-nls.patch
+ "${FILESDIR}"/${P}-rc-segfault.patch
)
src_prepare() {
[gentoo-commits] proj/portage-utils:master commit in: /
commit: deec7fe6c3159a04e6d65b1823bbe39c923ddd17 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 20:27:45 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 20:27:45 2020 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=deec7fe6 main: try to clear a warning on Travis platform Signed-off-by: Fabian Groffen gentoo.org> main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.c b/main.c index c6ef973..9068102 100644 --- a/main.c +++ b/main.c @@ -641,7 +641,7 @@ read_one_repos_conf(const char *repos_conf, char **primary) char *repo; char *buf = NULL; size_t buf_len = 0; - char *s; + char *s = NULL; /* pacify compiler */ char *p; char *q; char *r;
[gentoo-commits] repo/gentoo:master commit in: app-office/scribus/, app-office/scribus/files/
commit: 4ffdbba60050b08a2f1546481e699b65c69e1529
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 20:00:57 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 20:26:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffdbba6
app-office/scribus: Fix build with app-text/poppler-0.84.0
Reported-by: Erik Zeek gmail.com>
Thanks-to: Julien Papasian gmail.com>
Closes: https://bugs.gentoo.org/704482
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../scribus/files/scribus-1.5.5-poppler-0.84.patch | 34 ++
app-office/scribus/scribus-1.5.5.ebuild| 3 +-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
new file mode 100644
index 000..de1f39411e8
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.84.patch
@@ -0,0 +1,34 @@
+From 3742559924136c2471ab15081c5b600dd5feaeb0 Mon Sep 17 00:00:00 2001
+From: Jean Ghali
+Date: Sat, 28 Dec 2019 21:32:29 +
+Subject: [PATCH] Fix failure to build with poppler 0.84.0
+
+git-svn-id: svn://scribus.net/trunk/Scribus@23429
11d20701-8431-0410-a711-e3c959e3b870
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 6 ++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+index ffcfa8450b..d788f9f06c 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA,
Catalog *catA)
+ catalog = catA;
+ pdfDoc = doc;
+ updateGUICounter = 0;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0)
++ m_fontEngine = new SplashFontEngine(true, true, true, true);
++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0)
++ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(),
true, true, true);
++#else
+ m_fontEngine = new SplashFontEngine(
+ #if HAVE_T1LIB_H
+ globalParams->getEnableT1lib(),
+@@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA,
Catalog *catA)
+ true,
+ #endif
+ true);
++#endif
+ }
+
+ void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
diff --git a/app-office/scribus/scribus-1.5.5.ebuild
b/app-office/scribus/scribus-1.5.5.ebuild
index cd725acf6b8..88bcd5cc441 100644
--- a/app-office/scribus/scribus-1.5.5.ebuild
+++ b/app-office/scribus/scribus-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -70,6 +70,7 @@ PATCHES=(
# upstream svn trunk
"${FILESDIR}"/${P}-poppler-0.82.patch
"${FILESDIR}"/${P}-poppler-0.83.patch
+ "${FILESDIR}"/${P}-poppler-0.84.patch
# non(?)-upstreamable
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
"${FILESDIR}"/${P}-docdir.patch
[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gromacs/
commit: 730740b74ec2c133b225870c4f6ee620b3f3dab5 Author: Alexey Shvetsov gentoo org> AuthorDate: Thu Jan 2 20:21:16 2020 + Commit: Alexey Shvetsov gentoo org> CommitDate: Thu Jan 2 20:21:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730740b7 sci-chemistry/gromacs: Version bump Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Alexey Shvetsov gentoo.org> sci-chemistry/gromacs/Manifest | 4 +- ...cs-2020_rc1.ebuild => gromacs-2020..ebuild} | 2 +- ...gromacs-2020_rc1.ebuild => gromacs-2020.ebuild} | 2 +- sci-chemistry/gromacs/gromacs-.ebuild | 75 ++ 4 files changed, 67 insertions(+), 16 deletions(-) diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest index 867bba59978..68cba940949 100644 --- a/sci-chemistry/gromacs/Manifest +++ b/sci-chemistry/gromacs/Manifest @@ -1,8 +1,8 @@ DIST gromacs-2018.8.tar.gz 29913703 BLAKE2B 8780032305928067fbfe1559efe9eedc4d47e27ab2f6ab54d6dba39edfcbeefbee4673d8910009048a850620b5a08ba8feb622db652c439cfa50a149ec5f0015 SHA512 6717895942f2ab7b54019511ed2aebadadde8e96d3c4b7414bb9168ffe418432d2dee330192e199f7b9d2f665c71f5d4f1ef0911aa7243d525a2ca182ef5b122 DIST gromacs-2019.2.tar.gz 33437869 BLAKE2B bebe4942688dace148856d4491b687b8e0fd2c86d7fbd9eecdb46824d316a0fc3854464ecafa79d8db92327ee8467be204b050c11f1e71132184efd812c3bf09 SHA512 da7ff24e8485774e22d1c2464fbe64675c3305ef0e21a3d17e363201031952e5d4a9b81f572d5284fb6f2596ed99daf62fe78d653387d9d714274f46bc750183 DIST gromacs-2019.5.tar.gz 33445791 BLAKE2B 1e2e2764b0c8774c878abf4f32c2fa7ddd9b46f464cf1256deb48335433d92ef1b315f5534cdec9f766ae928a71361b5a4dd4a4def638269eb260ff98dbbe8bb SHA512 fdd177e4dfd29629b72bfbb4d61ff7bcdb37279f534883a9df8fd57569212fe1e9f8b8c9cec347fcc607539f31412d604d11ee3c0eb797251960435962b1bec6 -DIST gromacs-2020-rc1.tar.gz 29077110 BLAKE2B 5d5e6e63bd6b4dd03b688913b2da923547daddb270bca1a7d6ab8e625c26fb1031eea65330bd2e772f958e72e5a096c662633fbc71e7ee32ad83d99dcfb09170 SHA512 9dac945c5de9be2dc79bdde4d5f4afa3f2818334437ef8b4d1c57e46bdb80a0623ed7b16e1a8100395820b7eec367ea14195d420d3564f0f4eef0c88c52e78f9 +DIST gromacs-2020.tar.gz 28928068 BLAKE2B 72d4ff8f6b383284e61df9d3b2b53c51300f6961d4c19810670c8ee9ba2f1864d2a325e2774093b9338db785cb91a94461bf93f16cdf4caf0f690298a672d51c SHA512 15f0d58cd8d217eab39ef8e3535dec34127708797eaf6575fb340292cbee2303cd25deb84b3d4417a787076f4ae7be9e4958ec3a347a3aa9aed52ef337a4587c DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B 34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275 SHA512 3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb DIST regressiontests-2019.2.tar.gz 67643003 BLAKE2B 4178de5d62f194a81f97e442c10f123dc59c5e63f2078f7f07135709f3f6e530e0d237bf40264b285c084519d5ace75dfcbcddc16dc740c4f17233dc33542e45 SHA512 c1f25bc770d3f0a873c887d5563c1cd88179e81211b70ce6f5015696e6fa0b6931a8da7a449f2b223f3105b9e2e7eca67248e96fbfc2a7fd5fb360ba616f22ff DIST regressiontests-2019.5.tar.gz 67643634 BLAKE2B c4d9535d9a8a650869d67544ad5f367324f45e55325bb5074ece9b010f232f2f0dd97c9af97924d3f2368ed63015ca7330baff1cc681310e1439ec330b70ee8d SHA512 7c0917b76e7db35ab4e3271d523d268e0e2d858091e68ead863bfe6d1e56b381e30fdbf44f479f6e065c029e2eb27cfa0dbaa1b243f185144321aaf5084c55ce -DIST regressiontests-2020-rc1.tar.gz 48537816 BLAKE2B f9f4cde7a29691459d36e5f3fac91e75f4ebc6d95302c760722f4731a63a5e0695c8bc5106d38bb7b7266f6bac19bcb988496b572dca3f500f6c323c72615c60 SHA512 fb082479a3f3e03aaac4653682680ba8409f42a47f6e64e2a67e497467fce28e013b4fed8f9d3a1ce2db52237eb0e92e6e5c8de9be33beb7324d855de20b6ec7 +DIST regressiontests-2020.tar.gz 48536146 BLAKE2B 9511db78b5d6a5ea431fdb73782f28dde4b94655139886c0ad519888ef3e435fe81807f158d66c1a4284cb88fe730f62d039ac23549f17d0ce5984764ef35f10 SHA512 5a35aaf6fe2f3b146c7045e9c967dc1c8bf754748cc1f2a7300193ae3f206a9f5058329380ae7b03b181410303bcd434584571e6161a75f99e52bd48f8ba1821 diff --git a/sci-chemistry/gromacs/gromacs-2020_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2020..ebuild similarity index 99% copy from sci-chemistry/gromacs/gromacs-2020_rc1.ebuild copy to sci-chemistry/gromacs/gromacs-2020..ebuild index 162d64c983f..859628fa107 100644 --- a/sci-chemistry/gromacs/gromacs-2020_rc1.ebuild +++ b/sci-chemistry/gromacs/gromacs-2020..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sci-chemistry/gromacs/gromacs-2020_rc1.ebuild b/sci-chemistry/gromacs/gromacs-2020.ebuild similarity index 99% rename from sci-chemistry/gromacs/gromacs-2020_rc1.ebuild rename to sci-chemistry/gromacs/gromacs-2020.ebuild index 162d64c983f..859628fa107 100644 --- a/sci-chemistry/gromacs/gromacs-2020_rc1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gromacs/
commit: 667b7ea56b582e32342a5fff3b804c57538784e7
Author: Alexey Shvetsov gentoo org>
AuthorDate: Thu Jan 2 20:10:18 2020 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Thu Jan 2 20:10:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=667b7ea5
sci-chemistry/gromacs: Drop old versions
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Alexey Shvetsov gentoo.org>
sci-chemistry/gromacs/Manifest | 2 -
sci-chemistry/gromacs/gromacs-2018.7.ebuild | 272
2 files changed, 274 deletions(-)
diff --git a/sci-chemistry/gromacs/Manifest b/sci-chemistry/gromacs/Manifest
index 1262c124478..867bba59978 100644
--- a/sci-chemistry/gromacs/Manifest
+++ b/sci-chemistry/gromacs/Manifest
@@ -1,9 +1,7 @@
-DIST gromacs-2018.7.tar.gz 29912662 BLAKE2B
0714b28ec2443f3201275fc2fa6db1202a059161362134d4de03a900a3a67fe9d31ba8c058d5ee971198fecd69379fcd389f03d25c61f50b8460c43ba5c564d5
SHA512
fbc3b847b70b1396f412b8f4a1b977268651f8d53a222dcf6349fe563ff6319e096484209a24351e382bc9162a949b3900591f5b469c32dd9effeb894f03c172
DIST gromacs-2018.8.tar.gz 29913703 BLAKE2B
8780032305928067fbfe1559efe9eedc4d47e27ab2f6ab54d6dba39edfcbeefbee4673d8910009048a850620b5a08ba8feb622db652c439cfa50a149ec5f0015
SHA512
6717895942f2ab7b54019511ed2aebadadde8e96d3c4b7414bb9168ffe418432d2dee330192e199f7b9d2f665c71f5d4f1ef0911aa7243d525a2ca182ef5b122
DIST gromacs-2019.2.tar.gz 33437869 BLAKE2B
bebe4942688dace148856d4491b687b8e0fd2c86d7fbd9eecdb46824d316a0fc3854464ecafa79d8db92327ee8467be204b050c11f1e71132184efd812c3bf09
SHA512
da7ff24e8485774e22d1c2464fbe64675c3305ef0e21a3d17e363201031952e5d4a9b81f572d5284fb6f2596ed99daf62fe78d653387d9d714274f46bc750183
DIST gromacs-2019.5.tar.gz 33445791 BLAKE2B
1e2e2764b0c8774c878abf4f32c2fa7ddd9b46f464cf1256deb48335433d92ef1b315f5534cdec9f766ae928a71361b5a4dd4a4def638269eb260ff98dbbe8bb
SHA512
fdd177e4dfd29629b72bfbb4d61ff7bcdb37279f534883a9df8fd57569212fe1e9f8b8c9cec347fcc607539f31412d604d11ee3c0eb797251960435962b1bec6
DIST gromacs-2020-rc1.tar.gz 29077110 BLAKE2B
5d5e6e63bd6b4dd03b688913b2da923547daddb270bca1a7d6ab8e625c26fb1031eea65330bd2e772f958e72e5a096c662633fbc71e7ee32ad83d99dcfb09170
SHA512
9dac945c5de9be2dc79bdde4d5f4afa3f2818334437ef8b4d1c57e46bdb80a0623ed7b16e1a8100395820b7eec367ea14195d420d3564f0f4eef0c88c52e78f9
-DIST regressiontests-2018.7.tar.gz 67856738 BLAKE2B
955ae8b5e74f90fec704cf41fbd00bd8c09d754f950551fe0adfcd407db6fdb4491a3815149ea37d36c747316c79d462e823b9f6b26f2376bf90d87aad95731b
SHA512
c2ff390750bd99faebcd8d5dd8ad6dbf2b00113ed888bf985dbf95d7f347093adb67f3c396547b3e2990de330fddb7efe83ded91a72cf97c82a1dac7e826
DIST regressiontests-2018.8.tar.gz 67855469 BLAKE2B
34c9b339f6229f483afbb5192ee6ba8b8f72d5c26907a853af9c53dfece0d88739e48f6b44b78d1c010f988f9385d077285300522164f533a5861e9dda879275
SHA512
3642389d27bd1942cd0f091c940ae97b197b94856a387fe581dc516b0d4169480f16551d4ba357f9282b3337d605c286d51dd38112ac87c826dda634904836bb
DIST regressiontests-2019.2.tar.gz 67643003 BLAKE2B
4178de5d62f194a81f97e442c10f123dc59c5e63f2078f7f07135709f3f6e530e0d237bf40264b285c084519d5ace75dfcbcddc16dc740c4f17233dc33542e45
SHA512
c1f25bc770d3f0a873c887d5563c1cd88179e81211b70ce6f5015696e6fa0b6931a8da7a449f2b223f3105b9e2e7eca67248e96fbfc2a7fd5fb360ba616f22ff
DIST regressiontests-2019.5.tar.gz 67643634 BLAKE2B
c4d9535d9a8a650869d67544ad5f367324f45e55325bb5074ece9b010f232f2f0dd97c9af97924d3f2368ed63015ca7330baff1cc681310e1439ec330b70ee8d
SHA512
7c0917b76e7db35ab4e3271d523d268e0e2d858091e68ead863bfe6d1e56b381e30fdbf44f479f6e065c029e2eb27cfa0dbaa1b243f185144321aaf5084c55ce
diff --git a/sci-chemistry/gromacs/gromacs-2018.7.ebuild
b/sci-chemistry/gromacs/gromacs-2018.7.ebuild
deleted file mode 100644
index 8e5e3827188..000
--- a/sci-chemistry/gromacs/gromacs-2018.7.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit bash-completion-r1 cmake-utils cuda eutils multilib readme.gentoo-r1
toolchain-funcs xdg-utils
-
-if [[ $PV = ** ]]; then
- EGIT_REPO_URI="git://git.gromacs.org/gromacs.git
- https://gerrit.gromacs.org/gromacs.git
- https://github.com/gromacs/gromacs.git
- https://repo.or.cz/r/gromacs.git;
- [[ $PV = ]] && EGIT_BRANCH="master" ||
EGIT_BRANCH="release-${PV:0:4}"
- inherit git-r3
-else
- SRC_URI="ftp://ftp.gromacs.org/pub/${PN}/${PN}-${PV/_/-}.tar.gz
- test? (
http://gerrit.gromacs.org/download/regressiontests-${PV/_/-}.tar.gz )"
- KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-fi
-
-ACCE_IUSE="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_fma4
cpu_flags_x86_avx cpu_flags_x86_avx2"
-
-DESCRIPTION="The ultimate molecular dynamics simulation package"
-HOMEPAGE="http://www.gromacs.org/;
-
-# see
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 465f6695232b0f99af3fa57b8ce1141b116e9575 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 20:00:11 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 20:00:11 2020 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=465f6695 qmerge: add closedir to plug leak Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/qmerge.c b/qmerge.c index 6d9439f..588b868 100644 --- a/qmerge.c +++ b/qmerge.c @@ -970,6 +970,7 @@ merge_tree_at(int fd_src, const char *src, int fd_dst, const char *dst, } } + closedir(dir); ret = 0; done:
[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/kstars/
commit: f369f80a5ccdfc2364bac3381cf153c4563d8606
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 19:41:48 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 19:41:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f369f80a
sci-astronomy/kstars: 3.3.9 version bump
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-astronomy/kstars/Manifest| 1 +
sci-astronomy/kstars/kstars-3.3.9.ebuild | 97
2 files changed, 98 insertions(+)
diff --git a/sci-astronomy/kstars/Manifest b/sci-astronomy/kstars/Manifest
index bc499435e4f..2344626207e 100644
--- a/sci-astronomy/kstars/Manifest
+++ b/sci-astronomy/kstars/Manifest
@@ -1,2 +1,3 @@
DIST kstars-3.2.3.tar.xz 70750660 BLAKE2B
ea44b1ab2ba5d34a472b513180c148093defeff9fc2b8fb823621149b836a6fb7d6f53e0e50765de7c423fcdcdfc8fac6ae4feb4c4670d475353e091fa14d20c
SHA512
29c534c860cb1ab2c52e497061b16c7870e63253a7184f79ed8565d56abbc2909160d7f8c649764e4eb7462630e30e4428a88753e7987e97e530b174076cbd37
DIST kstars-3.3.8.tar.xz 70991244 BLAKE2B
f8f1508d0eb019d5247df8bdd5472dff42113ed24625f581482e2f403da0d1e6311b6c6e9d78a67548b9cec8b2536fbe1e3f886f16bd493d275b7414c8af8033
SHA512
bfc6b6a4e1d9856d290468b44071f02fe3e2c0f0b3bd90f9c3ebe671abee9e18c24898777065a21adbd4794e8e64beb17c6d339b88cabe750bf3b3a9efb327d0
+DIST kstars-3.3.9.tar.xz 71097252 BLAKE2B
d8593be78f30de8e9ce00744f71ef23eda51bdfdd4fea1aa5b4e25605b2d45c337f66c76b8804b292c8277a768aa08d7acc1d52cb0ad955bc67a54a370e15b74
SHA512
51a8687d8f438eda2e6c079ce9bec25aa1e84b4cff697da08e91d38388e85595bea8ed06a2a8d6a8a4ce133e768e28fb5a6a0ff763514e751d693c32f91e95c6
diff --git a/sci-astronomy/kstars/kstars-3.3.9.ebuild
b/sci-astronomy/kstars/kstars-3.3.9.ebuild
new file mode 100644
index 000..027a65724d5
--- /dev/null
+++ b/sci-astronomy/kstars/kstars-3.3.9.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Desktop Planetarium"
+HOMEPAGE="https://kde.org/applications/education/org.kde.kstars
+https://edu.kde.org/kstars/;
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-3+"
+SLOT="5"
+IUSE="fits indi +password raw wcs"
+
+REQUIRED_USE="indi? ( fits ) ${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ >=dev-qt/qtdatavis3d-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtsql-${QTMIN}:5
+ >=dev-qt/qtsvg-${QTMIN}:5
+ >=dev-qt/qtwebsockets-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kcrash-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/knewstuff-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/knotifyconfig-${KFMIN}:5
+ >=kde-frameworks/kplotting-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ sys-libs/zlib
+ fits? ( sci-libs/cfitsio )
+ indi? (
+ >=sci-libs/indilib-1.7.5
+ sci-libs/libnova
+ )
+ password? ( dev-libs/qtkeychain:= )
+ raw? ( media-libs/libraw:= )
+ wcs? ( sci-astronomy/wcslib )
+"
+# TODO: Add back when re-enabled by upstream
+# opengl? (
+# >=dev-qt/qtopengl-${QTMIN}:5
+# virtual/opengl
+# )
+DEPEND="${COMMON_DEPEND}
+ dev-cpp/eigen:3
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ >=dev-qt/qtgraphicaleffects-${QTMIN}:5
+ >=dev-qt/qtpositioning-${QTMIN}:5
+ >=dev-qt/qtquickcontrols-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DFETCH_TRANSLATIONS=OFF
+ -DBUILD_DOC=$(usex handbook)
+ $(cmake_use_find_package fits CFitsio)
+ $(cmake_use_find_package indi INDI)
+ $(cmake_use_find_package password Qt5Keychain)
+ $(cmake_use_find_package raw LibRaw)
+ $(cmake_use_find_package wcs WCSLIB)
+ )
+
+ ecm_src_configure
+}
+
+pkg_postinst () {
+ ecm_pkg_postinst
+
+ if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "x11-misc/xplanet"
; then
+ elog "${PN} has optional runtime support for x11-misc/xplanet"
+ fi
+ # same for
[gentoo-commits] repo/gentoo:master commit in: dev-libs/spdlog/
commit: 86dbe75068bbedbc3a9e591cb79fbf9b21e0992c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 19:07:25 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 19:09:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86dbe750
dev-libs/spdlog: Switch to cmake.eclass
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-libs/spdlog/spdlog-1.3.0.ebuild | 6 +++---
dev-libs/spdlog/spdlog-1.3.1.ebuild | 6 +++---
dev-libs/spdlog/spdlog-.ebuild | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/dev-libs/spdlog/spdlog-1.3.0.ebuild
b/dev-libs/spdlog/spdlog-1.3.0.ebuild
index d1e170a969e..f6cb54548b9 100644
--- a/dev-libs/spdlog/spdlog-1.3.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Very fast, header only, C++ logging library"
HOMEPAGE="https://github.com/gabime/spdlog;
@@ -37,5 +37,5 @@ src_configure() {
-DSPDLOG_BUILD_TESTS=$(usex test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild
b/dev-libs/spdlog/spdlog-1.3.1.ebuild
index ddf07aa21ca..69ab5a2e653 100644
--- a/dev-libs/spdlog/spdlog-1.3.1.ebuild
+++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Very fast, header only, C++ logging library"
HOMEPAGE="https://github.com/gabime/spdlog;
@@ -37,5 +37,5 @@ src_configure() {
-DSPDLOG_BUILD_TESTS=$(usex test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/dev-libs/spdlog/spdlog-.ebuild
b/dev-libs/spdlog/spdlog-.ebuild
index 3381d35fd4b..f0b80109ac4 100644
--- a/dev-libs/spdlog/spdlog-.ebuild
+++ b/dev-libs/spdlog/spdlog-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="Very fast, header only, C++ logging library"
HOMEPAGE="https://github.com/gabime/spdlog;
@@ -37,5 +37,5 @@ src_configure() {
-DSPDLOG_BUILD_TESTS=$(usex test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/arpon/, app-misc/pdfpc/, dev-util/apitrace/, net-libs/rabbitmq-c/, ...
commit: 87dba25ff56f7f54573d2a1f52d5241b7f4f1247
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 2 00:57:34 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 2 19:04:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87dba25f
*/*: Switch m-n packages to cmake.eclass
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-arch/unshield/unshield-1.4.3.ebuild | 2 +-
app-misc/pdfpc/pdfpc-4.3.2.ebuild | 6 +++---
app-text/apvlv/apvlv-0.1.5-r2.ebuild | 6 +++---
dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild | 8
dev-libs/poco/poco-1.9.0-r2.ebuild| 10 +-
dev-util/apitrace/apitrace-8.0.ebuild | 5 +++--
media-gfx/maim/maim-5.5.3.ebuild | 4 ++--
media-gfx/maim/maim-.ebuild | 4 ++--
media-sound/flacon/flacon-5.5.1.ebuild| 4 ++--
media-sound/supercollider/supercollider-3.10.2.ebuild | 6 +++---
net-analyzer/arpon/arpon-2.7.2-r1.ebuild | 4 ++--
net-irc/anope/anope-2.0.6.ebuild | 8
net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild | 4 ++--
sys-cluster/hpx/hpx-1.2.1.ebuild | 8
sys-cluster/hpx/hpx-.ebuild | 8
x11-misc/flow-pomodoro/flow-pomodoro-1.2.0-r1.ebuild | 2 +-
x11-misc/slop/slop-.ebuild| 4 ++--
x11-misc/xcalib/xcalib-0.10.ebuild| 2 +-
x11-wm/ctwm/ctwm-4.0.3.ebuild | 6 +++---
19 files changed, 51 insertions(+), 50 deletions(-)
diff --git a/app-arch/unshield/unshield-1.4.3.ebuild
b/app-arch/unshield/unshield-1.4.3.ebuild
index f81ff080ff9..80da8114a2a 100644
--- a/app-arch/unshield/unshield-1.4.3.ebuild
+++ b/app-arch/unshield/unshield-1.4.3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="InstallShield CAB file extractor"
HOMEPAGE="https://github.com/twogood/unshield;
diff --git a/app-misc/pdfpc/pdfpc-4.3.2.ebuild
b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
index 8de1c1444c1..889c7715a7f 100644
--- a/app-misc/pdfpc/pdfpc-4.3.2.ebuild
+++ b/app-misc/pdfpc/pdfpc-4.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
VALA_MIN_API_VERSION="0.34"
VALA_MAX_API_VERSION="0.42" # fix sed line if you increase this
-inherit vala cmake-utils
+inherit vala cmake
DESCRIPTION="Presenter console with multi-monitor support for PDF files"
HOMEPAGE="https://pdfpc.github.io;
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}"
BDEPEND="$(vala_depend)"
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
sed -i -e "s/valac/valac valac-0.42 valac-0.40 valac-0.36 valac-0.34/"
cmake/vala/FindVala.cmake || die
vala_src_prepare
@@ -40,5 +40,5 @@ src_configure(){
-DSYSCONFDIR="${EPREFIX}/etc"
-DMOVIES=$(usex gstreamer on off)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
index e952e34db06..5138d37d5ed 100644
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit xdg cmake-utils desktop
+inherit xdg cmake desktop
DESCRIPTION="Alf's PDF Viewer Like Vim"
HOMEPAGE="https://naihe2010.github.com/apvlv/;
@@ -44,10 +44,10 @@ src_configure() {
-DAPVLV_WITH_DJVU=$(usex djvu)
-DAPVLV_ENABLE_DEBUG=$(usex debug)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
newicon -s 32 icons/pdf.png ${PN}.png
}
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
index 7816ece23a2..c8a700b3a51 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
DESCRIPTION="SQLite Database Browser"
HOMEPAGE="https://sqlitebrowser.org;
@@ -41,7 +41,7 @@ RDEPEND="${DEPEND}
PATCHES=( "${FILESDIR}"/${PN}-3.11.1-unbundle.patch )
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
rm -r libs || die
sed -i 's#"src/qhexedit.h"##' src/EditDialog.cpp || die
#find libs/{antlr-2.7.7,qcustomplot-source,qscintilla} -delete || die
@@ -58,10 +58,10 @@ src_configure() {
local mycmakeargs=(
-DENABLE_TESTING=$(usex test)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
doicon images/sqlitebrowser.svg
}
diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild
b/dev-libs/poco/poco-1.9.0-r2.ebuild
index
[gentoo-commits] repo/gentoo:master commit in: net-vpn/wireguard-tools/
commit: ab41d97cb6c8b73e2620029a219cf77861a4cba2 Author: Jason A. Donenfeld gentoo org> AuthorDate: Thu Jan 2 18:54:38 2020 + Commit: Jason A. Donenfeld gentoo org> CommitDate: Thu Jan 2 18:54:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab41d97c net-vpn/wireguard-tools: bump to 1.0.20200102 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Jason A. Donenfeld gentoo.org> net-vpn/wireguard-tools/Manifest| 2 +- ...rd-tools-1.0.20191226.ebuild => wireguard-tools-1.0.20200102.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-vpn/wireguard-tools/Manifest b/net-vpn/wireguard-tools/Manifest index 85daaf6d376..c08bb73250b 100644 --- a/net-vpn/wireguard-tools/Manifest +++ b/net-vpn/wireguard-tools/Manifest @@ -1 +1 @@ -DIST wireguard-tools-1.0.20191226.tar.xz 90720 BLAKE2B 1becc2c963118604f518e5ea53fa3677f6b245827c67c42ab258625930a6c8bc9886dcfbc464338ba7705f681fbff7a9fd0380b18d6ec07895938dfc33bd36de SHA512 e6b7fc34f9517efc830b751e054e811acdd7f210e8f68b5ad5a503ee0c081bcb1a65e64e82a0b66ddfea9ef3ea0ca3210d5620c278d1b17442e233be1734ef03 +DIST wireguard-tools-1.0.20200102.tar.xz 91496 BLAKE2B efe42dfc08c8eceb5831deaa57cd274599a0a92ac3489a49e8e633388bb6ebaaab0f48ad6f7338d539ec247fafca9491c7296de654e6539a8a392c428d47ca7e SHA512 a4275eefc55b2a7ed3935a46a2098f9b0acdfaf0e1ed33ca42b51a186b388b53425ded5887e2cfc5be2802d6a453b8ebbf0294800ec1307a2dc21f46bd040da6 diff --git a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild similarity index 98% rename from net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild rename to net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild index bd16ac3af08..5600d6cff47 100644 --- a/net-vpn/wireguard-tools/wireguard-tools-1.0.20191226.ebuild +++ b/net-vpn/wireguard-tools/wireguard-tools-1.0.20200102.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7
[gentoo-commits] repo/gentoo:master commit in: dev-libs/nss/files/
commit: 27037007ea09027bcebb488b1e348f192ba115e3
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Jan 2 06:59:03 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 2 18:33:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27037007
dev-libs/nss: remove unused patches
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14210
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-libs/nss/files/nss-3.21-enable-pem.patch| 11 -
dev-libs/nss/files/nss-3.32-gentoo-fixups.patch | 274
dev-libs/nss/files/nss-3.36.7-fix-cms.patch | 531
3 files changed, 816 deletions(-)
diff --git a/dev-libs/nss/files/nss-3.21-enable-pem.patch
b/dev-libs/nss/files/nss-3.21-enable-pem.patch
deleted file mode 100644
index e6de275787d..000
--- a/dev-libs/nss/files/nss-3.21-enable-pem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
nss/lib/ckfw/manifest.mn
-+++ nss/lib/ckfw/manifest.mn
-@@ -5,7 +5,7 @@
-
- CORE_DEPTH = ../..
-
--DIRS = builtins
-+DIRS = builtins pem
-
- PRIVATE_EXPORTS = \
- ck.h \
diff --git a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
b/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
deleted file mode 100644
index 1773da98819..000
--- a/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From 8e49e1c92dadc2e7a41cad44637f4a224e4f5b39 Mon Sep 17 00:00:00 2001
-From: "Jory A. Pratt"
-Date: Fri, 28 Jul 2017 14:00:41 -0500
-Subject: [PATCH] add pkg-config file
-
-Signed-off-by: Jory A. Pratt
- Makefile | 11 +---
- config/Makefile | 40 ++
- config/nss-config.in | 145 +++
- config/nss.pc.in | 12 +
- manifest.mn | 2 +-
- 5 files changed, 199 insertions(+), 11 deletions(-)
- create mode 100644 config/Makefile
- create mode 100644 config/nss-config.in
- create mode 100644 config/nss.pc.in
-
-diff --git a/Makefile b/Makefile
-index 48bae37..9850883 100644
a/Makefile
-+++ b/Makefile
-@@ -47,7 +47,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL). #
- ###
-
--nss_build_all: build_nspr all latest
-+nss_build_all: all latest
-
- nss_clean_all: clobber_nspr clobber
-
-@@ -135,15 +135,6 @@ $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
- --prefix='$(NSS_GYP_PREFIX)'
- endif
-
--build_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
--
--install_nspr: build_nspr
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install
--
--clobber_nspr: $(NSPR_CONFIG_STATUS)
-- $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
--
- build_docs:
- $(MAKE) -C $(CORE_DEPTH)/doc
-
-diff --git a/config/Makefile b/config/Makefile
-new file mode 100644
-index 000..600fe48
/dev/null
-+++ b/config/Makefile
-@@ -0,0 +1,40 @@
-+CORE_DEPTH = ..
-+DEPTH = ..
-+
-+include $(CORE_DEPTH)/coreconf/config.mk
-+
-+NSS_MAJOR_VERSION = `grep "NSS_VMAJOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_MINOR_VERSION = `grep "NSS_VMINOR" ../lib/nss/nss.h | awk '{print $$3}'`
-+NSS_PATCH_VERSION = `grep "NSS_VPATCH" ../lib/nss/nss.h | awk '{print $$3}'`
-+PREFIX = /usr
-+
-+all: export libs
-+
-+export:
-+ # Create the nss.pc file
-+ mkdir -p $(DIST)/lib/pkgconfig
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@exec_prefix@,\$${prefix}," \
-+ -e "s,@libdir@,\$${prefix}/lib64," \
-+ -e "s,@includedir@,\$${prefix}/include/nss," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION),g" \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss.pc.in > nss.pc
-+ chmod 0644 nss.pc
-+ ln -sf ../../../../config/nss.pc $(DIST)/lib/pkgconfig
-+
-+ # Create the nss-config script
-+ mkdir -p $(DIST)/bin
-+ sed -e "s,@prefix@,$(PREFIX)," \
-+ -e "s,@NSS_MAJOR_VERSION@,$(NSS_MAJOR_VERSION)," \
-+ -e "s,@NSS_MINOR_VERSION@,$(NSS_MINOR_VERSION)," \
-+ -e "s,@NSS_PATCH_VERSION@,$(NSS_PATCH_VERSION)," \
-+ nss-config.in > nss-config
-+ chmod 0755 nss-config
-+ ln -sf ../../../config/nss-config $(DIST)/bin
-+
-+libs:
-+
-+dummy: all export libs
-+
-diff --git a/config/nss-config.in b/config/nss-config.in
-new file mode 100644
-index 000..1d7c444
/dev/null
-+++ b/config/nss-config.in
-@@ -0,0 +1,145 @@
-+#!/bin/sh
-+
-+prefix=@prefix@
-+
-+major_version=@NSS_MAJOR_VERSION@
-+minor_version=@NSS_MINOR_VERSION@
-+patch_version=@NSS_PATCH_VERSION@
-+
-+usage()
-+{
-+ cat <&2
-+fi
-+
-+lib_ssl=yes
-+lib_smime=yes
-+lib_nss=yes
-+lib_nssutil=yes
-+
-+while test $# -gt 0; do
-+ case "$1" in
-+ -*=*) optarg=`echo "$1" | sed
[gentoo-commits] repo/gentoo:master commit in: dev-libs/librelp/files/
commit: b244d14874981d2d5ce4e221ac6e9ed9705fc17d
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Jan 2 06:58:04 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 2 18:31:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b244d148
dev-libs/librelp: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14211
Signed-off-by: Thomas Deutschmann gentoo.org>
...lp-1.3.0-dummyclient.py-Py3-compatibility.patch | 24 --
1 file changed, 24 deletions(-)
diff --git
a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
deleted file mode 100644
index 99ac9887f73..000
---
a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 93c7ab4284f0609abab7cf2f9b8bdefe21fe0038 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann
-Date: Tue, 11 Dec 2018 16:50:12 +0100
-Subject: [PATCH] tests: make dummyclient.py compatible with Python2 and
- Python3
-
-Closes: https://github.com/rsyslog/librelp/issues/163
- tests/dummyclient.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/dummyclient.py b/tests/dummyclient.py
-index 6f99c79..8b0041e 100755
a/tests/dummyclient.py
-+++ b/tests/dummyclient.py
-@@ -4,7 +4,7 @@
- import os
-
- port = int(os.environ['TESTPORT'])
--print "dummyclient info: opening and closing port " + str(port) + " without
sending data"
-+print("dummyclient info: opening and closing port " + str(port) + " without
sending data")
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect(("127.0.0.1", port))
- s.close()
[gentoo-commits] proj/genkernel:master commit in: /
commit: d00387e421e541bad7e3c16e2a7c67bc3c0a1cb7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jan 2 17:33:03 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 2 17:33:03 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=d00387e4
gen_funcs.sh: gen_die(): Prevent recursion
Closes: https://bugs.gentoo.org/704546
Signed-off-by: Thomas Deutschmann gentoo.org>
gen_funcs.sh | 8
1 file changed, 8 insertions(+)
diff --git a/gen_funcs.sh b/gen_funcs.sh
index 87e4b3a..1f574ad 100755
--- a/gen_funcs.sh
+++ b/gen_funcs.sh
@@ -407,6 +407,14 @@ gen_die() {
# We died in a subshell! Let's trigger trap function...
kill -s SIGTERM ${GK_MASTER_PID}
else
+ if [ -z "${GK_DIED_IN}" ]
+ then
+ GK_DIED_IN="$(get_useful_function_stack)"
+ else
+ # We are already dying
+ exit 1
+ fi
+
# Don't trust $LOGFILE before determine_real_args() was called
if [ -n "${CMD_LOGFILE}" -a -s "${LOGFILE}" ]
then
[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
commit: 9ef3314cacd4ca1f4982e1bac56eabc7436f8457
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 2 17:15:12 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 2 17:16:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ef3314c
media-libs/mesa: Add missing libselinux dependency
Backport to 19.2.8 before stabilization, since there isn't expected to
be a 19.2.9.
Bug: https://bugs.gentoo.org/703600
Signed-off-by: Matt Turner gentoo.org>
media-libs/mesa/mesa-19.2.8.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/mesa/mesa-19.2.8.ebuild
b/media-libs/mesa/mesa-19.2.8.ebuild
index 9fb49167ff4..1645a4c7ca7 100644
--- a/media-libs/mesa/mesa-19.2.8.ebuild
+++ b/media-libs/mesa/mesa-19.2.8.ebuild
@@ -109,6 +109,7 @@ RDEPEND="
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
)
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
wayland? (
>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
>=dev-libs/wayland-protocols-1.8
[gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/
commit: b5e4401804084ae44829c9fcc6716a1e3b7445f6 Author: Matt Turner gentoo org> AuthorDate: Thu Jan 2 17:28:19 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Jan 2 17:28:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5e44018 x11-misc/xkeyboard-config: Drop old blockers Signed-off-by: Matt Turner gentoo.org> x11-misc/xkeyboard-config/xkeyboard-config-.ebuild | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-.ebuild index d2d56f95cc3..65c25664dd4 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-.ebuild @@ -25,10 +25,7 @@ BDEPEND=" sys-devel/gettext virtual/pkgconfig " -RDEPEND=" - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/
commit: 37eca6918bce1e76aed689620915f62eabedf5be
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 2 17:26:31 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 2 17:26:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37eca691
media-libs/mesa: Drop old blocker
Signed-off-by: Matt Turner gentoo.org>
media-libs/mesa/mesa-19.2.8.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-libs/mesa/mesa-19.2.8.ebuild
b/media-libs/mesa/mesa-19.2.8.ebuild
index 1645a4c7ca7..62727e5234b 100644
--- a/media-libs/mesa/mesa-19.2.8.ebuild
+++ b/media-libs/mesa/mesa-19.2.8.ebuild
@@ -104,7 +104,6 @@ RDEPEND="
)
vaapi? (
>=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- video_cards_nouveau? (
!<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
)
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: dev-python/urllib3/
commit: a28132e71c221f126d642de2f85d0c3c44f2a037
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 17:08:46 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 17:11:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a28132e7
dev-python/urllib3: Fix OutdatedBlocker
Signed-off-by: Michał Górny gentoo.org>
dev-python/urllib3/urllib3-1.24.2.ebuild | 5 ++---
dev-python/urllib3/urllib3-1.25.7.ebuild | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild
b/dev-python/urllib3/urllib3-1.24.2.ebuild
index cf59c0ffa92..6f77d2dfe89 100644
--- a/dev-python/urllib3/urllib3-1.24.2.ebuild
+++ b/dev-python/urllib3/urllib3-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,8 +19,7 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
- !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild
b/dev-python/urllib3/urllib3-1.25.7.ebuild
index 105aa2407f8..51674c033ad 100644
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild
@@ -19,8 +19,7 @@ IUSE="brotli test"
RESTRICT="!test? ( test )"
RDEPEND="
- >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
- !~dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-python/urllib3/
commit: afca75d466f544587ff0e5c564e7f68de5ceccd2
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 17:00:03 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 17:11:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afca75d4
dev-python/urllib3: Fix missing doc-deps
Closes: https://bugs.gentoo.org/704548
Signed-off-by: Michał Górny gentoo.org>
dev-python/urllib3/urllib3-1.25.7.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild
b/dev-python/urllib3/urllib3-1.25.7.ebuild
index 0e4482064dd..105aa2407f8 100644
--- a/dev-python/urllib3/urllib3-1.25.7.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -43,7 +43,9 @@ BDEPEND="
)
"
-distutils_enable_sphinx docs
+distutils_enable_sphinx docs \
+ dev-python/alabaster \
+ dev-python/mock
python_prepare_all() {
# tests requiring a route to be present
[gentoo-commits] repo/gentoo:master commit in: dev-util/android-studio/
commit: 20267b2d6c4a0653fa2b9c2ab85d2d5412ecda51
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Jan 2 17:02:46 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Thu Jan 2 17:02:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20267b2d
dev-util/android-studio: bump to 3.5.3
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
dev-util/android-studio/Manifest | 1 +
.../android-studio-3.5.3.0.191.6010548.ebuild | 129 +
2 files changed, 130 insertions(+)
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 8d58d6c20c8..5a9d8d74fac 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,4 @@
DIST android-studio-ide-183.5522156-linux.tar.gz 1087847976 BLAKE2B
6bff44f3d4dd5de1ce65ebc444c5b30d717b92ee34ccdfc268706f1ea07cc6c431ca6a42d361f89fdbe852f347b63afbfb9667acfd80980b869d244e5b957249
SHA512
2d9f10fc53c0d8036e413897c5003b07be106c5108a494d347b8c035b0e8155e13fcd487627b2b4910e918f41b1972b96cd078d09e3469eef2e18ce04a416b05
DIST android-studio-ide-191.5791312-linux.tar.gz 765055716 BLAKE2B
f0259adce0d3589a1c54ad16c1f745a10f4291ceb3554c9e6bb7433e6d57cb1fe6e1647df880b381172949a95cc908010977b87e3c34a868ccd00edfb3b7ba7c
SHA512
39bc345e57fba7b49074f412db71bf1e62cb2b23189149b8b1a72cbc159c285969708c8859def2d4a589cf8241b9a9cef2d93d72cf410554e469e66c20a6
DIST android-studio-ide-191.5900203-linux.tar.gz 774544330 BLAKE2B
f1bf4e808a731336c35d2a264fb7608e2129aab31eb9afe0f6e898603dbc5aac13e3c30335ed7c4567b5d3860299ed5ed4d25ba919eebf3f847955fdd49fced4
SHA512
5b736002e3a5dc0c6ff8897f05d20132444304bbd96ec4f14acf93dee8389e67f2bd037ae6d3df9770254a744f364d04f6324dcc17d49bf07006049c80572afa
+DIST android-studio-ide-191.6010548-linux.tar.gz 774544822 BLAKE2B
d14c8749015f7a0c9235552c04195f81a30a727adfc48d56d2b39ead6d8b017600be801e19fd8eae25ffd2ccbd081b59d464d7ae6bbf14c0a42dd508087d
SHA512
95e7befa684b02c5261244a0568f2180a3fd5cee2abe47309f4d183aae1c97b47c08af3cd228462f7db10f3bdb40c591472e74ffb9d89f08301fc25a04f41507
diff --git a/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
b/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
new file mode 100644
index 000..e9812c3699a
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.5.3.0.191.6010548.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop eutils java-pkg-2
+
+RESTRICT="strip"
+QA_PREBUILT="
+ opt/${PN}/bin/fsnotifier*
+ opt/${PN}/bin/libdbm64.so
+ opt/${PN}/bin/lldb/*
+ opt/${PN}/custom-jdk/*
+ opt/${PN}/lib/pty4j-native/linux/*/libpty.so
+ opt/${PN}/plugins/android/lib/libwebp_jni*.so
+ opt/${PN}/plugins/android/resources/installer/*
+ opt/${PN}/plugins/android/resources/perfetto/*
+ opt/${PN}/plugins/android/resources/simpleperf/*
+ opt/${PN}/plugins/android/resources/transport/*
+"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+ STUDIO_V=$(ver_cut 1-4)
+ BUILD_V=$(ver_cut 5-6)
+else
+ STUDIO_V=$(ver_cut 1-3)
+ BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html;
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.tar.gz;
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="custom-jdk selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-java/commons-logging:0
+ dev-java/log4j:0"
+
+RDEPEND="${DEPEND}
+ >=virtual/jdk-1.7
+ selinux? ( sec-policy/selinux-android )
+ >=app-arch/bzip2-1.0.6-r4
+ dev-java/commons-logging:0
+ dev-java/log4j:0
+ >=dev-libs/expat-2.1.0-r3
+ >=dev-libs/libffi-3.0.13-r1
+ >=media-libs/fontconfig-2.10.92
+ >=media-libs/freetype-2.5.5
+ >=media-libs/libpng-1.2.51
+ >=media-libs/mesa-10.2.8[X(+)]
+ || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage
x11-libs/libnotify )
+ sys-libs/ncurses-compat:5[tinfo]
+ >=sys-libs/zlib-1.2.8-r1
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXau-1.0.7-r1
+ >=x11-libs/libXdamage-1.1.4-r1
+ >=x11-libs/libXdmcp-1.1.1-r1
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXfixes-5.0.1
+ >=x11-libs/libXrender-0.9.8
+ >=x11-libs/libXxf86vm-1.1.3
+ >=x11-libs/libdrm-2.4.46
+ >=x11-libs/libxcb-1.9.1
+ >=x11-libs/libxshmfence-1.1"
+BDEPEND="dev-util/patchelf"
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+ eapply "${PATCHES[@]}"
+ eapply_user
+
+ # This is really a bundled jdk not a jre
+ # If custom-jdk is not set bundled jre is replaced with system vm/jdk
+
[gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/
commit: cd3384b4b67262108374e57cde3aee9dfe1203b3
Author: Mart Raudsepp gentoo org>
AuthorDate: Thu Jan 2 16:46:02 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Thu Jan 2 16:46:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd3384b4
net-libs/webkit-gtk-2.26: fix unsupported no-GL build
Closes: https://bugs.gentoo.org/704236
Package-Manager: Portage-2.3.79, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
.../webkit-gtk/files/2.26.2-fix-noGL-build.patch | 31 ++
net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
new file mode 100644
index 000..422c71a452f
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.26.2-fix-noGL-build.patch
@@ -0,0 +1,31 @@
+From 0fb66b8787a857c5c51b7efdc950a6ecf930b6ee Mon Sep 17 00:00:00 2001
+From: "ross.kirsl...@sony.com"
+
+Date: Fri, 4 Oct 2019 20:25:56 +
+Subject: [PATCH] Unreviewed WinCairo build fix for r250717.
+
+* WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h:
+(WebKit::LayerTreeHost::invalidate): Deleted.
+
+
+
+git-svn-id: https://svn.webkit.org/repository/webkit/trunk@250743
268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ .../WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletion(-)
+
+diff --git
a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+index 980513647ff..d214532d852 100644
+--- a/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
+@@ -212,7 +212,6 @@ inline void LayerTreeHost::scheduleLayerFlush() { }
+ inline void LayerTreeHost::cancelPendingLayerFlush() { }
+ inline void LayerTreeHost::setRootCompositingLayer(WebCore::GraphicsLayer*) {
}
+ inline void LayerTreeHost::setViewOverlayRootLayer(WebCore::GraphicsLayer*) {
}
+-inline void LayerTreeHost::invalidate() { }
+ inline void LayerTreeHost::scrollNonCompositedContents(const
WebCore::IntRect&) { }
+ inline void LayerTreeHost::forceRepaint() { }
+ inline bool LayerTreeHost::forceRepaintAsync(CallbackID) { return false; }
+--
+2.20.1
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
index 9cc790ed99f..b743a3359c9 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -172,6 +172,7 @@ pkg_setup() {
src_prepare() {
eapply "${FILESDIR}/${PN}-2.24.4-icu-65.patch" # bug 698596
eapply "${FILESDIR}/${PN}-2.24.4-eglmesaext-include.patch" # bug 699054
# https://bugs.webkit.org/show_bug.cgi?id=204108
+ eapply "${FILESDIR}"/${PV}-fix-noGL-build.patch # bug 704236
cmake-utils_src_prepare
gnome2_src_prepare
}
[gentoo-commits] repo/gentoo:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
commit: ed9a34fe8a9d45e8e9d5e3ca832b5ff67a58cfaf Author: Mart Raudsepp gentoo org> AuthorDate: Thu Jan 2 07:13:56 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Thu Jan 2 16:46:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9a34fe gnome-base/gvfs: remove old Package-Manager: Portage-2.3.79, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> gnome-base/gvfs/Manifest | 1 - .../gvfs/files/1.38.3-gvfsdaemon-rpath.patch | 35 -- gnome-base/gvfs/gvfs-1.38.3.ebuild | 137 - 3 files changed, 173 deletions(-) diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 564a0ea6549..f57bd2ca2bb 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,4 +1,3 @@ DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00bc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45 DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2eb30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457 -DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch deleted file mode 100644 index f3fe513d06e..000 --- a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57010ebb148b9b14e40140c7a8ce133a72128cf6 Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Thu, 18 Jul 2019 03:38:41 -0500 -Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so - -On Slackware development branch with gvfs-1.40.2, I just noticed this: - # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found" - libgvfscommon.so => not found - -After some backtracking, it seems that this first occurred in the -switchover from autotools to meson in the 1.36.x --> 1.38.x bump. - -Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and -assistance with troubleshooting this. - -Signed-off-by: Robby Workman - daemon/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 7f2608bd..0006f35e 100644 a/daemon/meson.build -+++ b/daemon/meson.build -@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library( - dependencies: deps, - c_args: cflags, - install: true, -+ install_rpath: gvfs_rpath, - install_dir: gvfs_pkglibdir - ) - --- -2.20.1 - diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild deleted file mode 100644 index 5cd798af734..000 --- a/gnome-base/gvfs/gvfs-1.38.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit gnome.org gnome2-utils meson systemd xdg - -DESCRIPTION="Virtual filesystem implementation for GIO" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs; - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" -RESTRICT="!test? ( test )" -# elogind/systemd only relevant to udisks (in v1.38.1) -REQUIRED_USE=" - ?? ( elogind systemd ) - cdda? ( udev ) - google? ( gnome-online-accounts ) - gphoto2? ( udev ) - mtp? ( udev ) - udisks? ( udev ) -" -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.57.2:2 - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - sys-apps/dbus - app-crypt/gcr:= - policykit? ( - >=sys-auth/polkit-0.114 - sys-libs/libcap ) - http? ( - dev-libs/libxml2:2 - >=net-libs/libsoup-2.42.0:2.4 ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) - udev? ( >=dev-libs/libgudev-147:= ) - fuse? ( >=sys-fs/fuse-2.8.0:0 ) - udisks? (
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libfmt/
commit: e2af7b10cf7f1273aa29e416c9c0520d42ad12ad
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 16:45:58 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 16:46:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2af7b10
dev-libs/libfmt: Cleanup old versions
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
dev-libs/libfmt/Manifest| 3 ---
dev-libs/libfmt/libfmt-6.0.0.ebuild | 36
dev-libs/libfmt/libfmt-6.1.0.ebuild | 36
dev-libs/libfmt/libfmt-6.1.1.ebuild | 36
4 files changed, 111 deletions(-)
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index f81907dea20..1c10bf6ac3c 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,5 +1,2 @@
DIST libfmt-5.3.0.tar.gz 662493 BLAKE2B
462c54c227132b2398977ff575f74e63e973825968b106e09cb0f3da859f1d851a6dd1799c05e3ae6adff2ac972f4af259c42fdf8429346b2830134571c31480
SHA512
9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
-DIST libfmt-6.0.0.tar.gz 708425 BLAKE2B
c04fb7f701e98442848a36489b09eca3dd64f736f668f04173db3afe77da6d933f5f13a2fe38489a5880fa1e4d8549dd34acc9fa37fbb0d6cdee3b6598610726
SHA512
7deb5bd843ae6b9d4b58dca9c68c1cfe7b55a41040f358247f5309655188d1ae194ff414437c068f74367f078faa214b5883e8c9e634c7623dcda50850e24766
-DIST libfmt-6.1.0.tar.gz 722127 BLAKE2B
2916293ebaff27a06f22e3c99bc1aee835d633a2b2eaa06d50dadff54f7ee20ed32c6e642f607274fdeeaf647a6aef03fde454555fa90c3ad790bb1be9c88a24
SHA512
51ee5fbe0ae7f9427289b7de37192652f16c63dd5fbf2d52dbf34e89d690ccd7ca5fd7962774d27a2d80fb1ccfa6836c171b519cfa0c41367772ebf8ef1fa81f
-DIST libfmt-6.1.1.tar.gz 722236 BLAKE2B
5497a89af4511d4b8356757fed17c5dc8bcc66cb60c85e2dc05db524a5eb5ae0247347bd3c6ca61edd12f0a469c26477de95290f977cf27f2413ba91d39dafdc
SHA512
8018bec519ce788331c8be8d51a19d4eaceb6a2f33d6618ebe78d953fbef28a70d5b61f0db1c051cbe1e0ee26f3c09197caac196a4c20d1b6abd7f86619f5fef
DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B
36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d
SHA512
8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
diff --git a/dev-libs/libfmt/libfmt-6.0.0.ebuild
b/dev-libs/libfmt/libfmt-6.0.0.ebuild
deleted file mode 100644
index 20f7a7d84f9..000
--- a/dev-libs/libfmt/libfmt-6.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt;
-
-LICENSE="MIT"
-IUSE="test"
-RESTRICT="!test? ( test )"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/fmtlib/fmt.git;
- inherit git-r3
-else
- SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
- S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
- -DFMT_LIB_DIR="$(get_libdir)"
- -DFMT_TEST=$(usex test)
- -DBUILD_SHARED_LIBS=ON
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-6.1.0.ebuild
b/dev-libs/libfmt/libfmt-6.1.0.ebuild
deleted file mode 100644
index cf60d148a15..000
--- a/dev-libs/libfmt/libfmt-6.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib eapi7-ver
-
-DESCRIPTION="Small, safe and fast formatting library"
-HOMEPAGE="https://github.com/fmtlib/fmt;
-
-LICENSE="MIT"
-IUSE="test"
-SLOT="0/$(ver_cut 1)"
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/fmtlib/fmt.git;
- inherit git-r3
-else
- SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
- S="${WORKDIR}/fmt-${PV}"
-fi
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
- -DFMT_LIB_DIR="$(get_libdir)"
- -DFMT_TEST=$(usex test)
- -DBUILD_SHARED_LIBS=ON
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/libfmt/libfmt-6.1.1.ebuild
b/dev-libs/libfmt/libfmt-6.1.1.ebuild
deleted file mode 100644
index cf60d148a15..000
--- a/dev-libs/libfmt/libfmt-6.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright
[gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/
commit: 5a6bef06a07d48be8c692e4e8d331a13398e4986
Author: Dennis Lamm gentoo org>
AuthorDate: Thu Jan 2 16:44:08 2020 +
Commit: Dennis Lamm gentoo org>
CommitDate: Thu Jan 2 16:44:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a6bef06
sys-apps/firejail: version bump
Signed-off-by: Dennis Lamm gentoo.org>
Package-Manager: Portage-2.3.79, Repoman-2.3.16
sys-apps/firejail/Manifest | 1 +
sys-apps/firejail/{firejail-.ebuild => firejail-0.9.62.ebuild} | 3 ++-
sys-apps/firejail/firejail-.ebuild | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 2cdea90dbcf..0507331eef0 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1 +1,2 @@
DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B
c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee
SHA512
cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
+DIST firejail-0.9.62.tar.gz 918477 BLAKE2B
8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319
SHA512
dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
diff --git a/sys-apps/firejail/firejail-.ebuild
b/sys-apps/firejail/firejail-0.9.62.ebuild
similarity index 97%
copy from sys-apps/firejail/firejail-.ebuild
copy to sys-apps/firejail/firejail-0.9.62.ebuild
index f47575ac444..8dfef857188 100644
--- a/sys-apps/firejail/firejail-.ebuild
+++ b/sys-apps/firejail/firejail-0.9.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -47,6 +47,7 @@ src_prepare() {
src_configure() {
econf \
+ --disable-firetunnel \
$(use_enable apparmor) \
$(use_enable chroot) \
$(use_enable contrib contrib-install) \
diff --git a/sys-apps/firejail/firejail-.ebuild
b/sys-apps/firejail/firejail-.ebuild
index f47575ac444..8dfef857188 100644
--- a/sys-apps/firejail/firejail-.ebuild
+++ b/sys-apps/firejail/firejail-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -47,6 +47,7 @@ src_prepare() {
src_configure() {
econf \
+ --disable-firetunnel \
$(use_enable apparmor) \
$(use_enable chroot) \
$(use_enable contrib contrib-install) \
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 7f610741388d8543d3d7652de4625eaa7caa6dfd
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 15:32:37 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 15:32:37 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=7f610741
qcheck: fix use after free
Signed-off-by: Fabian Groffen gentoo.org>
qcheck.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/qcheck.c b/qcheck.c
index 1217a8a..59f35e2 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -305,7 +305,6 @@ qcheck_cb(tree_pkg_ctx *pkg_ctx, void *priv)
}
free(line);
free(buffer);
- fclose(fp_contents);
if (!state->chk_config_protect) {
freeargv(cp_argc, cp_argv);
@@ -328,9 +327,12 @@ qcheck_cb(tree_pkg_ctx *pkg_ctx, void *priv)
fclose(fp_contents_update);
if (renameat(pkg_ctx->fd, "CONTENTS~", pkg_ctx->fd, "CONTENTS"))
unlinkat(pkg_ctx->fd, "CONTENTS~", 0);
- if (!verbose)
+ if (!verbose) {
+ fclose(fp_contents);
return EXIT_SUCCESS;
+ }
}
+ fclose(fp_contents);
if (state->bad_only && num_files_ok != num_files)
printf("%s\n", atom_format(state->fmt, atom));
qcprintf(" %2$s*%1$s %3$s%4$zu%1$s out of %3$s%5$zu%1$s file%6$s are
good",
[gentoo-commits] repo/gentoo:master commit in: net-misc/pyhoca-gui/
commit: f4f18f22e022449d5917119396284da238e08a9a
Author: Bernard Cafarelli gentoo org>
AuthorDate: Thu Jan 2 15:31:27 2020 +
Commit: Bernard Cafarelli gentoo org>
CommitDate: Thu Jan 2 15:31:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f18f22
net-misc/pyhoca-gui: 0.6.1.1 bump
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Bernard Cafarelli gentoo.org>
net-misc/pyhoca-gui/Manifest | 1 +
net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild | 35 +++
2 files changed, 36 insertions(+)
diff --git a/net-misc/pyhoca-gui/Manifest b/net-misc/pyhoca-gui/Manifest
index 9f201a480ad..f5da2e7b92b 100644
--- a/net-misc/pyhoca-gui/Manifest
+++ b/net-misc/pyhoca-gui/Manifest
@@ -1,3 +1,4 @@
DIST pyhoca-gui-0.5.0.8.tar.gz 2064483 BLAKE2B
63bca5be8673ef4e274caf4e0813b73f5dc8af7818b7638b2ac7411bb1598272bab573bc55c6c5e48fc45cc185bad907594b99ee0c96546683ecd8dd1ef1e3f1
SHA512
35bcbe35056d718ec5b58733b8569fd40cd6843a6661cc19deed02287cf65e03b4812fc82bdb0d54b12a78d5547456463e8adf236d4a7f04e11d0d462fe3eded
DIST pyhoca-gui-0.5.1.0.tar.gz 2098593 BLAKE2B
942caadb43654dbd65cfb50722f17b93b2becd410b90fb888a5133974b66ae377ab568204288e3a72441b74ad3e08a31190d67452a41086802177cc6a8f01406
SHA512
ae4287ccf2aadc4a6557c3bf37d01eb2cdfa542803ece41df02b7b816ba5b0be918231b40dba3c39a850064ae39907befdef1b80180649446b49fc975abbe312
DIST pyhoca-gui-0.6.1.0.tar.gz 2098973 BLAKE2B
fdd145bb8ba67d70571a2244bded2f5c30382725c21747778c7490a98cd85dd7e872aec9ba539d407764a9a3a38d590aed5742268ebc38aa9cfaa3fc5b5a679c
SHA512
d2730aa52afd4a835e593f3d8bde84435abb67aa490bb05807353d8d102c1d85564c21decbaf04e5cf54ef4a376247cf4a5ba1f7c9baf96149dbea9e583ea9cb
+DIST pyhoca-gui-0.6.1.1.tar.gz 2099727 BLAKE2B
944ee3cd743d502ce320759b9200c74de13802e23aabc2a5fe5659e123e2bbc368bf8a216c73de2c2ed22408d8fe50b4b945cc0714d05e1cb0faa1e5617dd4b0
SHA512
e7e24d60c1e4ecca2201c2a25bfc8c5552e54e30a5f744c5bc9c36ba4050a64cbb8616ab2e035b34cd14c62702ff88e32c863cac8aef0f8f4cb18db1d2e737b6
diff --git a/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
new file mode 100644
index 000..a484ce41375
--- /dev/null
+++ b/net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit distutils-r1
+
+DESCRIPTION="X2Go graphical client applet"
+HOMEPAGE="http://www.x2go.org;
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz;
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pycups[${PYTHON_USEDEP}]
+ dev-python/setproctitle[${PYTHON_USEDEP}]
+ dev-python/wxpython[${PYTHON_USEDEP}]
+ >=net-misc/python-x2go-0.6.1.1[${PYTHON_USEDEP}]
+ x11-libs/libnotify"
+DEPEND="${DEPEND}
+ dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+
+python_install() {
+ distutils-r1_python_install
+ python_doscript ${PN}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman man/man1/*
+ find "${ED}" -name '*.pth' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/m4ri/
commit: 28d9e7ff05e0ff1640dde05b1e25f2bfc630a700
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Jan 2 15:24:51 2020 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Jan 2 15:25:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28d9e7ff
sci-libs/m4ri: simplify openmp check.
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky gentoo.org>
sci-libs/m4ri/m4ri-20140914.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sci-libs/m4ri/m4ri-20140914.ebuild
b/sci-libs/m4ri/m4ri-20140914.ebuild
index 8fa18bf333d..2e7cb8b7207 100644
--- a/sci-libs/m4ri/m4ri-20140914.ebuild
+++ b/sci-libs/m4ri/m4ri-20140914.ebuild
@@ -28,9 +28,7 @@ RDEPEND="${DEPEND}"
DOCS=( AUTHORS )
pkg_pretend() {
- if use openmp ; then
- tc-has-openmp || die "Please switch to an openmp compatible
compiler"
- fi
+ use openmp && tc-check-openmp
}
src_configure() {
[gentoo-commits] proj/portage-utils:master commit in: travis/
commit: 3246fde76f7d3bd0ea03cf7913032981e62cff23
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 15:24:06 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 15:24:06 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3246fde7
travis: try differently to get valgrind to run
Signed-off-by: Fabian Groffen gentoo.org>
travis/main.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/travis/main.sh b/travis/main.sh
index 50f10c7..6f55073 100755
--- a/travis/main.sh
+++ b/travis/main.sh
@@ -50,8 +50,8 @@ main() {
do_run ${DEFARGS} --disable-qmanifest --disable-qtegrity
if [[ ${TRAVIS_OS_NAME} == linux ]] ; then
- do_run CFLAGS=-g Q_RUN_WITH_VALGRIND=1 \
- ${DEFARGS} --enable-qmanifest --enable-qtegrity
+ export Q_RUN_WITH_VALGRIND=1
+ do_run CFLAGS=-g ${DEFARGS} --enable-qmanifest --enable-qtegrity
fi
# LSan needs sudo, which we don't use at the moment
[gentoo-commits] proj/portage-utils:master commit in: /, tests/qcheck/
commit: 6d6d693b3e0cd3aa6ea19ffe036e5f50c15aa7dd
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 15:22:52 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 15:22:52 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=6d6d693b
qcheck: fix tests
Signed-off-by: Fabian Groffen gentoo.org>
qcheck.c | 5 +++--
tests/qcheck/list04.good | 2 +-
tests/qcheck/list05.good | 2 +-
tests/qcheck/list06.good | 2 +-
tests/qcheck/list07.good | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/qcheck.c b/qcheck.c
index e8db1b8..1217a8a 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -346,7 +346,7 @@ qcheck_cb(tree_pkg_ctx *pkg_ctx, void *priv)
(num_files_ignored > 1 ? "s were" : " was"));
qcprintf("\n");
- if (num_files_ok != num_files)
+ if (num_files_ok != num_files && !state->qc_update)
return EXIT_FAILURE;
else
return EXIT_SUCCESS;
@@ -410,6 +410,7 @@ int qcheck_main(int argc, char **argv)
ret = -1;
if (vdb != NULL) {
if (array_cnt(atoms) != 0) {
+ ret = 0;
array_for_each(atoms, i, atom) {
ret |= tree_foreach_pkg_sorted(vdb, qcheck_cb,
, atom);
}
@@ -427,5 +428,5 @@ int qcheck_main(int argc, char **argv)
array_for_each(atoms, i, atom)
atom_implode(atom);
xarrayfree_int(atoms);
- return ret;
+ return ret != 0;
}
diff --git a/tests/qcheck/list04.good b/tests/qcheck/list04.good
index 604d20c..2f9f512 100644
--- a/tests/qcheck/list04.good
+++ b/tests/qcheck/list04.good
@@ -8,4 +8,4 @@ Checking a-b/pkg ...
AFK: /missing-dir/missing-sym
* 4 out of 11 files are good (2 files were ignored)
Checking virtual/pkg ...
- * 0 out of 0 file are good
+ * 0 out of 0 files are good
diff --git a/tests/qcheck/list05.good b/tests/qcheck/list05.good
index 35a0ff5..688c177 100644
--- a/tests/qcheck/list05.good
+++ b/tests/qcheck/list05.good
@@ -8,4 +8,4 @@ Checking a-b/pkg ...
AFK: /missing-dir/missing-sym
* 4 out of 11 files are good (2 files were ignored)
Checking virtual/pkg ...
- * 0 out of 0 file are good
+ * 0 out of 0 files are good
diff --git a/tests/qcheck/list06.good b/tests/qcheck/list06.good
index fb241db..6129032 100644
--- a/tests/qcheck/list06.good
+++ b/tests/qcheck/list06.good
@@ -5,4 +5,4 @@ Checking a-b/pkg ...
MTIME: /bin/bad-mtime-sym
* 4 out of 8 files are good (5 files were ignored)
Checking virtual/pkg ...
- * 0 out of 0 file are good
+ * 0 out of 0 files are good
diff --git a/tests/qcheck/list07.good b/tests/qcheck/list07.good
index ae80975..847b0b5 100644
--- a/tests/qcheck/list07.good
+++ b/tests/qcheck/list07.good
@@ -1,4 +1,4 @@
Checking a-b/pkg ...
* 4 out of 4 files are good (9 files were ignored)
Checking virtual/pkg ...
- * 0 out of 0 file are good
+ * 0 out of 0 files are good
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxml2/
commit: 8abec3198f56c7d9f9b8ef52da9f2da9eff00eb5
Author: Aaron Bauman gentoo org>
AuthorDate: Thu Jan 2 15:20:04 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Thu Jan 2 15:20:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8abec319
dev-libs/libxml2: arm64 stable (bug #701020)
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20
dev-libs/libxml2/libxml2-2.9.9-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
index 5f7f29a15de..db07d6f39db 100644
--- a/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.9-r3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.xmlsoft.org/;
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
IUSE="debug examples icu ipv6 lzma python readline static-libs test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/lrcalc/files/, sci-mathematics/lrcalc/
commit: 46dcd8b7ddede5fed198022282a445a0a7498dea
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Jan 2 15:02:44 2020 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Jan 2 15:09:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46dcd8b7
sci-mathematics/lrcalc: new package for Littlewood-Richardson coeffs.
This package was imported from the sage-on-gentoo overlay with only a
few changes:
* Updated from EAPI=6 to EAPI=7.
* Enabled the test suite, which passes for me.
* Changed the HOMEPAGE/SRC_URI to use HTTPS, and follow a redirect.
* Updated LICENSE from GPL-2 to GPL-2+ based on the upstream
LICENSE file.
The SageMath package can detect and use lrcalc from the system, so
having this package installed will help Gentoo users of SageMath avoid
pointless rebuilds of lrcalc.
Closes: https://bugs.gentoo.org/704572
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky gentoo.org>
sci-mathematics/lrcalc/Manifest| 1 +
.../lrcalc/files/lrcalc-1.2-includes.patch | 90 ++
sci-mathematics/lrcalc/lrcalc-1.2.ebuild | 25 ++
sci-mathematics/lrcalc/metadata.xml| 24 ++
4 files changed, 140 insertions(+)
diff --git a/sci-mathematics/lrcalc/Manifest b/sci-mathematics/lrcalc/Manifest
new file mode 100644
index 000..b678d834147
--- /dev/null
+++ b/sci-mathematics/lrcalc/Manifest
@@ -0,0 +1 @@
+DIST lrcalc-1.2.tar.gz 363120 BLAKE2B
d3f652abfe38e81331dcbac7068d087b198445bf02dc5ccb5bcbd76b9bbc329687209e6ccf40ecd09f166e7d2da054edd0e5c2b18503d8e4d961ae4ad91b5152
SHA512
699f4c2ddabe5879542d5c11f3df3979a4e009ad37741711a70fb48b4a0d4a7969e5bb110adb63d4473f3c2b61d1efdb7228a6b74c5dd7e1b5aea8cf1d170fab
diff --git a/sci-mathematics/lrcalc/files/lrcalc-1.2-includes.patch
b/sci-mathematics/lrcalc/files/lrcalc-1.2-includes.patch
new file mode 100644
index 000..707da176a60
--- /dev/null
+++ b/sci-mathematics/lrcalc/files/lrcalc-1.2-includes.patch
@@ -0,0 +1,90 @@
+From 4a5e1c8c3c11efdb1cbb4239825a6bf4bf1c52f8 Mon Sep 17 00:00:00 2001
+From: Anders Skovsted Buch
+Date: Sun, 29 Nov 2015 16:25:56 -0500
+Subject: [PATCH] Patch by Jeroen Demeyer to change include to
+ "vector.h", plus similar cases.
+
+---
+ src/lrcalc.c | 2 +-
+ src/maple.c| 4 ++--
+ src/schublib.h | 2 +-
+ src/symfcn.c | 6 +++---
+ src/symfcn.h | 4 ++--
+ 5 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/lrcalc.c b/src/lrcalc.c
+index aff3f75..60df49e 100644
+--- a/src/lrcalc.c
b/src/lrcalc.c
+@@ -8,7 +8,7 @@
+ #include
+ extern char *optarg;
+
+-#include
++#include "vectarg.h"
+
+ #include "symfcn.h"
+ #include "maple.h"
+diff --git a/src/maple.c b/src/maple.c
+index fdc0768..a5f4d14 100644
+--- a/src/maple.c
b/src/maple.c
+@@ -4,8 +4,8 @@
+ */
+
+ #include
+-#include
+-#include
++#include "vector.h"
++#include "hashtab.h"
+ #include "maple.h"
+
+
+diff --git a/src/schublib.h b/src/schublib.h
+index a8e8511..864850c 100644
+--- a/src/schublib.h
b/src/schublib.h
+@@ -1,7 +1,7 @@
+ #ifndef _SCHUBLIB_H
+ #define _SCHUBLIB_H
+
+-#include
++#include "hashtab.h"
+
+ hashtab *trans(vector *w, int vars, hashtab *res);
+ hashtab *monk(int i, hashtab *slc, int rank);
+diff --git a/src/symfcn.c b/src/symfcn.c
+index 4ffbe4b..fd5df5d 100644
+--- a/src/symfcn.c
b/src/symfcn.c
+@@ -5,9 +5,9 @@
+
+ #include
+
+-#include
+-#include
+-#include
++#include "alloc.h"
++#include "vector.h"
++#include "hashtab.h"
+
+ #include "symfcn.h"
+
+diff --git a/src/symfcn.h b/src/symfcn.h
+index b8543b1..29bb00d 100644
+--- a/src/symfcn.h
b/src/symfcn.h
+@@ -1,8 +1,8 @@
+ #ifndef _SYMFCN_H
+ #define _SYMFCN_H
+
+-#include
+-#include
++#include "hashtab.h"
++#include "vector.h"
+
+ int part_itr_sz(vector *part);
+ int part_itr_sub(vector *part, vector *outer);
+--
+2.1.1.1.g1fb337f
+
diff --git a/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
new file mode 100644
index 000..30805331116
--- /dev/null
+++ b/sci-mathematics/lrcalc/lrcalc-1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Littlewood-Richardson Calculator"
+HOMEPAGE="https://sites.math.rutgers.edu/~asbuch/lrcalc/;
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2-includes.patch" )
+
+src_configure(){
+ econf $(use_enable static-libs static)
+}
+
+src_install(){
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/lrcalc/metadata.xml
b/sci-mathematics/lrcalc/metadata.xml
new file mode 100644
index 000..c070753f116
--- /dev/null
+++ b/sci-mathematics/lrcalc/metadata.xml
@@ -0,0 +1,24 @@
[gentoo-commits] proj/portage-utils:master commit in: /
commit: e2cb79946feea84f095b5c2aef6821fc5653b6bc Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 14:10:05 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 14:10:05 2020 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e2cb7994 qsize: update copyright Signed-off-by: Fabian Groffen gentoo.org> qsize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qsize.c b/qsize.c index 5cf7dae..617b50b 100644 --- a/qsize.c +++ b/qsize.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2019 Gentoo Foundation + * Copyright 2005-2020 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 * * Copyright 2005-2010 Ned Ludd-
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 5d0261aabae596a7beb9b6879201c43a064be800
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 14:59:24 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 14:59:24 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5d0261aa
qpkg: make use of tree being able to traverse binpkg trees
Signed-off-by: Fabian Groffen gentoo.org>
qpkg.c | 172 ++---
1 file changed, 69 insertions(+), 103 deletions(-)
diff --git a/qpkg.c b/qpkg.c
index 771241c..b210b09 100644
--- a/qpkg.c
+++ b/qpkg.c
@@ -54,115 +54,79 @@ extern char pretend;
static char *qpkg_bindir = NULL;
static int eclean = 0;
-/* checks to make sure this is a .tbz2 file. used by scandir() */
-static int
-filter_tbz2(const struct dirent *dentry)
-{
- if (dentry->d_name[0] == '.')
- return 0;
- if (strlen(dentry->d_name) < 6)
- return 0;
- return !strcmp(".tbz2", dentry->d_name + strlen(dentry->d_name) - 5);
-}
-
-/* process a single dir for cleaning. dir can be a $PKGDIR, $PKGDIR/All/,
$PKGDIR/$CAT */
-static uint64_t
-qpkg_clean_dir(char *dirp, set *vdb)
-{
- set *ll = NULL;
- struct dirent **fnames;
- int i, count;
- char buf[_Q_PATH_MAX * 2];
- struct stat st;
- uint64_t num_all_bytes = 0;
- size_t disp_units = 0;
- char **t;
- bool ignore;
-
- if (dirp == NULL)
- return 0;
- if (chdir(dirp) != 0)
- return 0;
- if ((count = scandir(".", , filter_tbz2, alphasort)) < 0)
- return 0;
-
- /* create copy of vdb with only basenames */
- for ((void)list_set(vdb, ); *t != NULL; t++)
- ll = add_set_unique(basename(*t), ll, );
-
- for (i = 0; i < count; i++) {
- fnames[i]->d_name[strlen(fnames[i]->d_name)-5] = 0;
- if (contains_set(fnames[i]->d_name, ll))
- continue;
- snprintf(buf, sizeof(buf), "%s.tbz2", fnames[i]->d_name);
- if (lstat(buf, ) != -1) {
- if (S_ISREG(st.st_mode)) {
- disp_units = KILOBYTE;
- if ((st.st_size / KILOBYTE) > 1000)
- disp_units = MEGABYTE;
- num_all_bytes += st.st_size;
- qprintf(" %s[%s %3s %s %s] %s%s%s\n",
- DKBLUE, GREEN,
-
make_human_readable_str(st.st_size, 1, disp_units),
- disp_units == MEGABYTE ? "MiB"
: "KiB",
- DKBLUE, BLUE,
fnames[i]->d_name, NORM);
- }
- if (!pretend)
- unlink(buf);
- }
- }
-
- free_set(ll);
- scandir_free(fnames, count);
-
- return num_all_bytes;
-}
-
/* figure out what dirs we want to process for cleaning and display results. */
static int
qpkg_clean(char *dirp)
{
- int i, count;
+ size_t n;
size_t disp_units = 0;
- uint64_t num_all_bytes;
- struct dirent **dnames;
- set *vdb = NULL;
+ uint64_t num_all_bytes = 0;
+ set *known_pkgs = NULL;
+ set *bin_pkgs = NULL;
+ DECLARE_ARRAY(bins);
tree_ctx *t;
+ tree_ctx *pkgs;
+ char *binatomstr;
+ depend_atom *atom;
+ char buf[_Q_PATH_MAX];
+ struct stat st;
- if (chdir(dirp) != 0)
- return 1;
- if ((count = scandir(".", , filter_hidden, alphasort)) < 0)
+ pkgs = tree_open_binpkg(portroot, dirp);
+ if (pkgs == NULL)
return 1;
+ bin_pkgs = tree_get_atoms(pkgs, true, bin_pkgs);
+ array_set(bin_pkgs, bins);
+
if (eclean) {
- size_t n;
const char *overlay;
array_for_each(overlays, n, overlay) {
t = tree_open(portroot, overlay);
if (t != NULL) {
- vdb = tree_get_atoms(t, true, vdb);
+ known_pkgs = tree_get_atoms(t, true,
known_pkgs);
tree_close(t);
}
}
} else {
t = tree_open_vdb(portroot, portvdb);
if (t != NULL) {
- vdb = tree_get_atoms(t, true, vdb);
+ known_pkgs = tree_get_atoms(t, true, known_pkgs);
tree_close(t);
}
}
- num_all_bytes = qpkg_clean_dir(dirp, vdb);
+ /* check which binpkgs exist in the known_pkgs (vdb or trees), such
+* that the remainder is what we would clean */
+ array_for_each(bins, n, binatomstr) {
+
[gentoo-commits] proj/portage-utils:master commit in: libq/
commit: bab8be1e6ef9998ca7285310a4fd135127442500 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 15:09:21 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 15:09:21 2020 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=bab8be1e libq/tree: ensure we don't leak scandir results on sorted foreach_pkg Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libq/tree.c b/libq/tree.c index 186fb4d..49b2fa1 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -1341,9 +1341,12 @@ tree_foreach_pkg(tree_ctx *ctx, tree_pkg_cb callback, void *priv, } /* allow foreach to be called again on the same open tree */ + if (ctx->do_sort) + scandir_free(ctx->cat_de, ctx->cat_cnt); ctx->cat_de = NULL; ctx->cat_cur = 0; ctx->cat_cnt = 0; + ctx->do_sort = 0; return ret; }
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-sources/
commit: 6595f6ee489d3bd6107d900eaed371f7fb9b0571 Author: Mike Pagano gentoo org> AuthorDate: Thu Jan 2 14:13:41 2020 + Commit: Mike Pagano gentoo org> CommitDate: Thu Jan 2 14:33:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6595f6ee sys-kernel/gentoo-sources: Clean-up of the 4.14.X series Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mike Pagano gentoo.org> sys-kernel/gentoo-sources/Manifest | 9 --- .../gentoo-sources/gentoo-sources-4.14.152.ebuild | 28 -- .../gentoo-sources/gentoo-sources-4.14.157.ebuild | 28 -- .../gentoo-sources/gentoo-sources-4.14.158.ebuild | 28 -- 4 files changed, 93 deletions(-) diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index a30a6fbb49b..8d32d2d92a3 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -1,18 +1,9 @@ DIST genpatches-4.14-152.base.tar.xz 3208180 BLAKE2B 3b3ddd2982128ef792a52ffd3494886e8915478c3326c1a849ba1d82a2806bb75af293932e8e36ec1949ac5cd4e0d2b29f5ece8f535e4d652a4b11f4101927c0 SHA512 697660cef9ae0b1b6ecfffa66dbfa1649990554d41e98657d881440475a47486df7bca9d2207770cf240caa843f3c3f7fd8f63e109203ec5e7d7cf93d54d41dd DIST genpatches-4.14-152.experimental.tar.xz 5928 BLAKE2B 6c8bdc67a25a7f18ea1a656e213e247a6db50ebf0649c7f27cd8e98847e912ac79f05d537a7b1ff3e614e68db29bd255b58a168862874685913894820d83ae9e SHA512 303c59fcfbe01fede4c5f06fe307490db567c8c40b79a2196fd57c637de7def8602b0acb1cb962329258661acf56f9150989fe4d72a194b8223d002fe16580cb DIST genpatches-4.14-152.extras.tar.xz 17492 BLAKE2B 1273ecf6f8b53a51350278c90970c8f19f3a4ab33318001f6c4d553c1fdacd0b12bb6e7331b01f4b4e619a8ff8f8ea6a21843061c29608271f79ab3a5550502e SHA512 3a797ef715a1b805b16c9904b4fc639eeff35ce3078c6879e3d2f2872aef0d13a0715a85a4bc03c0ef334eb85ca5c3edf5024bd63811eac3da37a796afb6a1b9 -DIST genpatches-4.14-161.base.tar.xz 3371384 BLAKE2B 0ae61e0d86abde12ee2f7e0dd780c25a77b83f7ef298011caa2cd97f992d285952b7a1ec00d4c96b3eb4640e79408fd9a199c42728636372568075d571b10d35 SHA512 0595b4dc29e793afa9eca0209fa380e3cc4bc44d98096ce686505b4944e48f4c3ccc2c580403fb706782ac624c79e3a42ca1547dd03665f261f17b084d8354c1 -DIST genpatches-4.14-161.experimental.tar.xz 5936 BLAKE2B 5a7d54384fc45858394a19c9ec848d08547104d8a30232911747979cb7aa6a51b8ca2b2a63e3868a1430e0ef091fc841cf4685346b9828ff19e1e94720e9950c SHA512 ba9c2822441770de8b1fbeae30c4427011ccab20b4c68b4c3ebdb2c13553b0851798dda44cb657a6af7959209e65a820f55e0bb0ed22d280620f23c6318cedda -DIST genpatches-4.14-161.extras.tar.xz 17504 BLAKE2B 70313ed1e57a4997d2e680e841cc73bb1d094f63edb6625dcd7b74c371a1198a80640c2b4d936791320b440b20434064b25f67c9a45a92093f7ac023003a014a SHA512 b19a17d9104334f69e18132d1d8cbbe2f6277fa058cd7b096f61207d278d54649396f37354240ad0a8fde544098707e1b260a3c848b6e5d3ca3091cdfc9f6073 DIST genpatches-4.14-165.base.tar.xz 3535804 BLAKE2B 04138406447a87c3b5cca02990946dcb9139fec2cef75f9daaf66dffa2616b88802540437524b8e7d636471f99188d1442d15b6400ade337566bf74530e630fb SHA512 4fd602cacb18b16fc623f9c55cdd70005b5ccc053b194587d3b92f3f79450d1654ab2d30171fcfd6179a1de43b7a4e48b486950c0eeb607ed9db61254912968a DIST genpatches-4.14-165.experimental.tar.xz 5936 BLAKE2B b09b68224f2376f3ced4dc1399f676438bbe67e5aa7732ba6263e50aa53b48d5c1e767e9aa9bf407d06e527587cdb1a99a8ae1ca222d69d51de458f5f3dd59cd SHA512 5ae55d73a86766084a9e1456ffd0d5127a63a6c5605de377c6ec99fc683d7d72c36a76387538d20f52261ca0efaae70fbdb052a07dbd5b1de909e2f189772e04 DIST genpatches-4.14-165.extras.tar.xz 17504 BLAKE2B e53a90401fbb16acb433c3f0bdd5875b65c2dff8dcba3d962093112b6ce250f9297aa1fe1ccbc4acc081614861a1a5ea00539d2fa8ddb14cc06fc630b0744c09 SHA512 9b7300a0acd7dcbd3ecb0ed6ebf22fb7f445cace807c316e32388c430e3cd74e8e59c0d4a404f3fbeacbf4ac17eaf28804b31e7cc610854bdfa260b66d164308 -DIST genpatches-4.14-166.base.tar.xz 3585524 BLAKE2B b3696acc2bce9c58768e65d52705760a41f12494154a9b2facc5b79ab83b6c2f500a49cfdde6856f993fa309ede182108cc659c4b666b573ea323fd20ddd SHA512 ef37c4b7bb81e5bff06a3d631f8b1400499d9ff6d2f7e16de8ec1a1923dad6fe6902381ccf493aec805a89a61230dd2b3983a243d5d5af4592ba78251081eb73 -DIST genpatches-4.14-166.experimental.tar.xz 5932 BLAKE2B 3f3cc32ecfb739c06234e082c68e39aa6dd31ea7c3e82e7684584d1e39645c34daf4c13619181f631c5aca2064948fc4ef20899eef4046b9bbb52060a4b88325 SHA512 17c002c429a11c2f074da34de09da6bf25f5bcce79d6e84211d89a787307fc9a09b6d14563373810c79d2f078fce084df876ae61c757f97c86ec17a78281c4c6 -DIST genpatches-4.14-166.extras.tar.xz 17512 BLAKE2B 257406f34c7e008bae222faa79719e23e59b22513d359217b4e3e14a6747298cb20b8181e9998799eebbe8f40e8913f07a39ac3faff3406a27b8b135c53f SHA512 bf01fa0f7e40112106029f99620477365cf436488d5acd53120b75b9d457d90967adeb53e5890a7982a8fbf999d701c99425a8c3afe1ec111324031694d2089d -DIST genpatches-4.14-167.base.tar.xz 3634424 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: sci-libs/m4ri/
commit: 60bdaa57a2569f7b1a3167d17aa005b01d1450fa
Author: Michael Orlitzky gentoo org>
AuthorDate: Wed Jan 1 20:46:18 2020 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Jan 2 14:20:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60bdaa57
sci-libs/m4ri: new package for dense matrix computations over F2.
This package was imported from the sage-on-gentoo overlay with only a
few changes:
* Updated from EAPI=6 to EAPI=7, and subsequently moved
virtual/pkgconfig to BDEPEND.
* Put the --enable-png flag behind USE=png.
* Enabled the test suite, which passes out-of-the-box for me.
* Update the HOMEPAGE to point to bitbucket; it was redirecting.
* Updated LICENSE to GPL-2+ from GPL-2 (based on file headers).
The SageMath package can detect and use the system copy of m4ri, which
means that this package should eliminate pointless rebuilds of m4ri
for users of SageMath on Gentoo.
Closes: https://bugs.gentoo.org/704500
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Michael Orlitzky gentoo.org>
sci-libs/m4ri/Manifest | 1 +
sci-libs/m4ri/m4ri-20140914.ebuild | 54 ++
sci-libs/m4ri/metadata.xml | 33 +++
3 files changed, 88 insertions(+)
diff --git a/sci-libs/m4ri/Manifest b/sci-libs/m4ri/Manifest
new file mode 100644
index 000..b9e9242c6b5
--- /dev/null
+++ b/sci-libs/m4ri/Manifest
@@ -0,0 +1 @@
+DIST m4ri-20140914.tar.gz 457978 BLAKE2B
eadba6d1a751cb49cef25cc7726d87aa5746b23ad0a3b9bd274735a71da43ec4751fb655f91f3748f082369875508db365595f8443d77ae9645b3e4199d4f204
SHA512
efdd4ffa194d2d2b64a23a833420926613e74072ce62b2b06d768d157e134a615d88b93ed08d9f51f0fd14d686fd068523d1dc2c7cd9fb87108c96a4a11f4643
diff --git a/sci-libs/m4ri/m4ri-20140914.ebuild
b/sci-libs/m4ri/m4ri-20140914.ebuild
new file mode 100644
index 000..8fa18bf333d
--- /dev/null
+++ b/sci-libs/m4ri/m4ri-20140914.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Method of four russian for inversion (M4RI)"
+HOMEPAGE="https://bitbucket.org/malb/m4ri;
+
+# We use the SageMath tarball instead of the one from bitbucket because
+# the bitbucket releases don't contain the "make dist" stuff and we
+# would need autotools.eclass to generate it.
+SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
+IUSE="debug openmp cpu_flags_x86_sse2 png static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="png? ( media-libs/libpng:= )"
+RDEPEND="${DEPEND}"
+
+# NEWS and ChangeLog are empty as of 2020-01-01, and README.md
+# didn't make it into the release tarball.
+DOCS=( AUTHORS )
+
+pkg_pretend() {
+ if use openmp ; then
+ tc-has-openmp || die "Please switch to an openmp compatible
compiler"
+ fi
+}
+
+src_configure() {
+ # when using openmp and -O0 the testsuite fails
+ # https://github.com/cschwan/sage-on-gentoo/issues/475
+ use openmp && replace-flags -O0 -O1
+
+ # kiwifb: cachetune option is not available, because it kills (at
+ # least my) X when I switch from yakuake to desktop
+ econf \
+ $(use_enable debug) \
+ $(use_enable openmp) \
+ $(use_enable png) \
+ $(use_enable cpu_flags_x86_sse2 sse2) \
+ $(use_enable static-libs static)
+}
+
+src_install(){
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/m4ri/metadata.xml b/sci-libs/m4ri/metadata.xml
new file mode 100644
index 000..9807bfb0055
--- /dev/null
+++ b/sci-libs/m4ri/metadata.xml
@@ -0,0 +1,33 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+m...@gentoo.org
+
+
+
+frp.bis...@gmail.com
+François Bissey
+
+
+proxy-ma...@gentoo.org
+Proxy Maintainers
+
+
+
+M4RI is a library for fast arithmetic with dense matrices over
+F2. The name M4RI comes from the first implemented algorithm: The
+"Method of the Four Russians" inversion algorithm published by
+Gregory Bard. This algorithm in turn is named after the 'Method of
+the Four Russians' multiplication algorithm which is probably
+better referred to as Kronrod's method.
+
+
+
+malb/m4ri
+
+
[gentoo-commits] proj/devmanual:master commit in: archs/x86/, tools-reference/echo/, tools-reference/sed/, tools-reference/tr/, ...
commit: d7b3e8d2adf3dfb2e01dd891887f640cc90cf291 Author: Ulrich Müller gentoo org> AuthorDate: Thu Jan 2 14:10:43 2020 + Commit: Ulrich Müller gentoo org> CommitDate: Thu Jan 2 14:10:43 2020 + URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=d7b3e8d2 Use for dashes in titles too. Now that whitespace in anchors is normalised, " " will be converted to a single "-" (i.e., the original dash will be ignored, and the surrounding spaces will be contracted into one hyphen). Signed-off-by: Ulrich Müller gentoo.org> appendices/common-problems/text.xml | 8 archs/alpha/text.xml| 2 +- archs/amd64/text.xml| 2 +- archs/mips/text.xml | 2 +- archs/ppc/text.xml | 2 +- archs/sparc/text.xml| 2 +- archs/x86/text.xml | 2 +- general-concepts/overlay/text.xml | 2 +- tools-reference/bash/text.xml | 2 +- tools-reference/cat/text.xml| 2 +- tools-reference/cut/text.xml| 2 +- tools-reference/diff-and-patch/text.xml | 2 +- tools-reference/echo/text.xml | 2 +- tools-reference/ekeyword/text.xml | 2 +- tools-reference/false-and-true/text.xml | 2 +- tools-reference/find/text.xml | 2 +- tools-reference/grep/text.xml | 2 +- tools-reference/head-and-tail/text.xml | 2 +- tools-reference/sed/text.xml| 2 +- tools-reference/sort/text.xml | 2 +- tools-reference/tr/text.xml | 2 +- tools-reference/uniq/text.xml | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/appendices/common-problems/text.xml b/appendices/common-problems/text.xml index 430e74b..bd0d630 100644 --- a/appendices/common-problems/text.xml +++ b/appendices/common-problems/text.xml @@ -28,7 +28,7 @@ covered here. -QA Notice -- USE Flag foo not in IUSE +QA Notice USE Flag foo not in IUSE @@ -42,7 +42,7 @@ See and -QA Notice -- foo in global scope +QA Notice foo in global scope @@ -87,7 +87,7 @@ in use, there are various alternatives: -QA Notice -- foo is setXid, dynamically linked and using lazy bindings +QA Notice foo is setXid, dynamically linked and using lazy bindings @@ -111,7 +111,7 @@ for security reasons. If this message is shown, you have a couple of options: -QA Notice -- ECLASS foo inherited illegally +QA Notice ECLASS foo inherited illegally diff --git a/archs/alpha/text.xml b/archs/alpha/text.xml index da13385..60a3694 100644 --- a/archs/alpha/text.xml +++ b/archs/alpha/text.xml @@ -1,7 +1,7 @@ -Arch Specific Notes -- Alpha +Arch Specific Notes Alpha diff --git a/archs/amd64/text.xml b/archs/amd64/text.xml index 0f75426..4bcf03d 100644 --- a/archs/amd64/text.xml +++ b/archs/amd64/text.xml @@ -1,7 +1,7 @@ -Arch Specific Notes -- AMD64/EM64T +Arch Specific Notes AMD64/EM64T Position Independent Code Issues diff --git a/archs/mips/text.xml b/archs/mips/text.xml index 9d7637c..7105076 100644 --- a/archs/mips/text.xml +++ b/archs/mips/text.xml @@ -1,7 +1,7 @@ -Arch Specific Notes -- MIPS +Arch Specific Notes MIPS diff --git a/archs/ppc/text.xml b/archs/ppc/text.xml index 837a526..b956286 100644 --- a/archs/ppc/text.xml +++ b/archs/ppc/text.xml @@ -1,7 +1,7 @@ -Arch Specific Notes -- PPC +Arch Specific Notes PPC diff --git a/archs/sparc/text.xml b/archs/sparc/text.xml index a0fda3b..fdf9a7f 100644 --- a/archs/sparc/text.xml +++ b/archs/sparc/text.xml @@ -1,7 +1,7 @@ -Arch Specific Notes -- SPARC +Arch Specific Notes SPARC diff --git a/archs/x86/text.xml b/archs/x86/text.xml index b2cc835..9cf62e6 100644 --- a/archs/x86/text.xml +++ b/archs/x86/text.xml @@ -1,7 +1,7 @@ -Arch Specific Notes -- x86 +Arch Specific Notes x86 diff --git a/general-concepts/overlay/text.xml b/general-concepts/overlay/text.xml index aca48c7..69e76d8 100644 --- a/general-concepts/overlay/text.xml +++ b/general-concepts/overlay/text.xml @@ -43,7 +43,7 @@ updates when an overlay eclass is changed, nor will it do cache updates when a main Gentoo repository eclass which is used by an overlay ebuild changes. You may also encounter bogus 'illegal inherit' notices when working with eclasses in an overlay (see ). +link="::appendices/common-problems/#QA Notice ECLASS foo inherited illegally"/>). To be safe, manually touch all relevant overlay files after updating overlay eclasses. diff --git a/tools-reference/bash/text.xml b/tools-reference/bash/text.xml index 98b5675..5c98188 100644 --- a/tools-reference/bash/text.xml +++ b/tools-reference/bash/text.xml @@ -1,7 +1,7 @@ -bash -- Standard Shell +bash Standard Shell diff --git a/tools-reference/cat/text.xml b/tools-reference/cat/text.xml index 51501ac..fbf8232 100644 --- a/tools-reference/cat/text.xml +++ b/tools-reference/cat/text.xml @@ -1,7 +1,7 @@
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 2e8bca1ee3fd0a3cf9c489a1b661245d20f808af
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 12:49:34 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 12:49:34 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2e8bca1e
qcheck: pass package atoms down to tree_foreach_pkg
Signed-off-by: Fabian Groffen gentoo.org>
qcheck.c | 39 ++-
1 file changed, 10 insertions(+), 29 deletions(-)
diff --git a/qcheck.c b/qcheck.c
index 66a4ee7..e8db1b8 100644
--- a/qcheck.c
+++ b/qcheck.c
@@ -70,8 +70,9 @@ struct qcheck_opt_state {
};
static int
-qcheck_process_contents(tree_pkg_ctx *pkg_ctx, struct qcheck_opt_state *state)
+qcheck_cb(tree_pkg_ctx *pkg_ctx, void *priv)
{
+ struct qcheck_opt_state *state = priv;
FILE *fp_contents, *fp_contents_update;
size_t num_files, num_files_ok, num_files_unknown, num_files_ignored;
char *buffer, *line;
@@ -334,7 +335,7 @@ qcheck_process_contents(tree_pkg_ctx *pkg_ctx, struct
qcheck_opt_state *state)
printf("%s\n", atom_format(state->fmt, atom));
qcprintf(" %2$s*%1$s %3$s%4$zu%1$s out of %3$s%5$zu%1$s file%6$s are
good",
NORM, BOLD, BLUE, num_files_ok, num_files,
- (num_files > 1 ? "s" : ""));
+ (num_files != 1 ? "s" : ""));
if (num_files_unknown)
qcprintf(" (Unable to digest %2$s%3$zu%1$s file%4$s)",
NORM, BLUE, num_files_unknown,
@@ -351,32 +352,6 @@ qcheck_process_contents(tree_pkg_ctx *pkg_ctx, struct
qcheck_opt_state *state)
return EXIT_SUCCESS;
}
-static int
-qcheck_cb(tree_pkg_ctx *pkg_ctx, void *priv)
-{
- struct qcheck_opt_state *state = priv;
- bool showit = false;
-
- /* see if this cat/pkg is requested */
- if (array_cnt(state->atoms)) {
- size_t i;
- depend_atom *qatom;
- depend_atom *atom;
-
- qatom = tree_get_atom(pkg_ctx, false);
- array_for_each(state->atoms, i, atom) {
- if (atom_compare(qatom, atom) == EQUAL) {
- showit = true;
- break;
- }
- }
- } else {
- showit = true;
- }
-
- return showit ? qcheck_process_contents(pkg_ctx, priv) : 0;
-}
-
int qcheck_main(int argc, char **argv)
{
size_t i;
@@ -434,7 +409,13 @@ int qcheck_main(int argc, char **argv)
vdb = tree_open_vdb(portroot, portvdb);
ret = -1;
if (vdb != NULL) {
- ret = tree_foreach_pkg_sorted(vdb, qcheck_cb, , NULL);
+ if (array_cnt(atoms) != 0) {
+ array_for_each(atoms, i, atom) {
+ ret |= tree_foreach_pkg_sorted(vdb, qcheck_cb,
, atom);
+ }
+ } else {
+ ret = tree_foreach_pkg_sorted(vdb, qcheck_cb, ,
NULL);
+ }
tree_close(vdb);
}
if (array_cnt(regex_arr) > 0) {
[gentoo-commits] proj/portage-utils:master commit in: libq/
commit: e575a3259cc0d74972359315f549f27372e1f6b6
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 13:22:22 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 13:22:22 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e575a325
libq/tree: fix bug after realloc in metadata Q__data
don't reposition the Q__data pointer itself, it was already updated to
the new value
Signed-off-by: Fabian Groffen gentoo.org>
libq/tree.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libq/tree.c b/libq/tree.c
index 570859e..e7914f1 100644
--- a/libq/tree.c
+++ b/libq/tree.c
@@ -922,7 +922,7 @@ tree_read_file_binpkg_xpak_cb(
if (old_data != NULL && m->Q__data != old_data) {
char **newdata = (char **)m;
int elems = sizeof(tree_pkg_meta) / sizeof(char *);
- while (elems-- > 0)
+ while (elems-- > 1) /* skip Q__data itself */
if (newdata[elems] != NULL)
newdata[elems] = m->Q__data +
(newdata[elems] - old_data);
}
@@ -999,7 +999,8 @@ tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t offset,
const char *keyn)
char **key;
/* offset is a byte offset in the tree_pkg_meta struct, pointing to
-* key, the tree_pkg_meta_get macro takes care of this */
+* key, the tree_pkg_meta_get macro as called by the user takes care
+* of offset and keyn pointing to the same thing */
if (ctx->cachetype == CACHE_VDB) {
if (pkg_ctx->meta == NULL)
@@ -1037,7 +1038,7 @@ tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t
offset, const char *keyn)
if (old_data != NULL && m->Q__data != old_data)
{
char **newdata = (char **)m;
int elems = sizeof(tree_pkg_meta) /
sizeof(char *);
- while (elems-- > 0)
+ while (elems-- > 1) /* skip Q__data
itself */
if (newdata[elems] != NULL)
newdata[elems] =
m->Q__data +
(newdata[elems] - old_data);
[gentoo-commits] proj/portage-utils:master commit in: libq/
commit: ad34656e2d3cd6400c6debf3c46f39ab19219a6b Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 12:45:52 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 12:45:52 2020 + URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=ad34656e libq/tree: allow tree_foreach_pkg to be called multiple times Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 5 + 1 file changed, 5 insertions(+) diff --git a/libq/tree.c b/libq/tree.c index 0fdf9b1..570859e 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -1339,6 +1339,11 @@ tree_foreach_pkg(tree_ctx *ctx, tree_pkg_cb callback, void *priv, tree_close_cat(cat_ctx); } + /* allow foreach to be called again on the same open tree */ + ctx->cat_de = NULL; + ctx->cat_cur = 0; + ctx->cat_cnt = 0; + return ret; }
[gentoo-commits] proj/portage-utils:master commit in: /
commit: 2d78938f5d4c3be536e7484c0f23be64b124db05
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 13:23:35 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 13:23:35 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2d78938f
qdepends: use tree_foreach_pkg query selection on forward queries
Signed-off-by: Fabian Groffen gentoo.org>
qdepends.c | 22 ++
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/qdepends.c b/qdepends.c
index 44821b6..6f580a9 100644
--- a/qdepends.c
+++ b/qdepends.c
@@ -375,14 +375,28 @@ int qdepends_main(int argc, char **argv)
array_for_each(overlays, n, overlay) {
t = tree_open(portroot, overlay);
if (t != NULL) {
- ret = tree_foreach_pkg_sorted(t,
- qdepends_results_cb, ,
NULL);
+ if (!(state.qmode & QMODE_REVERSE) &&
array_cnt(atoms) > 0) {
+ array_for_each(atoms, i, atom) {
+ ret = tree_foreach_pkg_sorted(t,
+
qdepends_results_cb, , atom);
+ }
+ } else {
+ ret = tree_foreach_pkg_sorted(t,
+ qdepends_results_cb,
, NULL);
+ }
tree_close(t);
}
}
} else {
- ret = tree_foreach_pkg_fast(state.vdb,
- qdepends_results_cb, , NULL);
+ if (!(state.qmode & QMODE_REVERSE) && array_cnt(atoms) > 0) {
+ array_for_each(atoms, i, atom) {
+ ret = tree_foreach_pkg_fast(state.vdb,
+ qdepends_results_cb, ,
atom);
+ }
+ } else {
+ ret = tree_foreach_pkg_fast(state.vdb,
+ qdepends_results_cb, , NULL);
+ }
}
if (state.vdb != NULL)
[gentoo-commits] proj/portage-utils:master commit in: libq/
commit: 70676c12f78bcf99ebc29901a6db36cbee6044c9
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 14:04:19 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 14:04:19 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=70676c12
libq/tree: fix off-by-ones
Signed-off-by: Fabian Groffen gentoo.org>
libq/tree.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libq/tree.c b/libq/tree.c
index e7914f1..186fb4d 100644
--- a/libq/tree.c
+++ b/libq/tree.c
@@ -912,7 +912,7 @@ tree_read_file_binpkg_xpak_cb(
while (isspace((int)data[data_offset + data_len - 1]))
data_len--;
- if (len - pos < (size_t)data_len) {
+ if (len - pos < (size_t)(data_len + 1)) {
char *old_data = m->Q__data;
len += (((data_len + 1) / BUFSIZ) + 1) * BUFSIZ;
m->Q__data = xrealloc(m->Q__data, len);
@@ -1028,7 +1028,7 @@ tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t
offset, const char *keyn)
len = (size_t)m->Q__md5_;
/* TODO: this is an exact copy from
tree_read_file_binpkg_xpak_cb */
- if (len - pos < (size_t)s.st_size) {
+ if (len - pos < (size_t)(s.st_size + 1)) {
char *old_data = m->Q__data;
len += (((s.st_size + 1) / BUFSIZ) + 1) *
BUFSIZ;
m->Q__data = xrealloc(m->Q__data, len);
@@ -1049,7 +1049,7 @@ tree_pkg_meta_get_int(tree_pkg_ctx *pkg_ctx, size_t
offset, const char *keyn)
char *p = *key = m->Q__data + pos;
p[s.st_size] = '\0';
while (s.st_size > 0 &&
isspace((int)p[s.st_size - 1]))
- p[s.st_size--] = '\0';
+ p[--s.st_size] = '\0';
pos += s.st_size + 1;
m->Q__eclasses_ = (char *)pos;
}
[gentoo-commits] proj/portage-utils:master commit in: /
commit: c7d98c2f2c2d98f8296139b19fd3920bc9e5c3fb
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 14:06:35 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 14:06:35 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=c7d98c2f
quse: push search atom down to tree_foreach_pkg when applicable
Signed-off-by: Fabian Groffen gentoo.org>
quse.c | 14 --
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/quse.c b/quse.c
index a8585be..358d9e0 100644
--- a/quse.c
+++ b/quse.c
@@ -426,16 +426,9 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv)
int portdirfd = -1; /* pacify compiler */
if (state->match || state->do_describe) {
- atom = tree_get_atom(pkg_ctx, 0);
+ atom = tree_get_atom(pkg_ctx, false);
if (atom == NULL)
return 0;
-
- if (state->match) {
- match = atom_compare(atom, state->match) == EQUAL;
-
- if (!match)
- return 0;
- }
}
if (!state->do_licence) {
@@ -719,14 +712,15 @@ int quse_main(int argc, char **argv)
} else if (state.do_installed) {
tree_ctx *t = tree_open_vdb(portroot, portvdb);
state.overlay = NULL;
- tree_foreach_pkg_sorted(t, quse_results_cb, , NULL);
+ tree_foreach_pkg_sorted(t, quse_results_cb, ,
state.match);
tree_close(t);
} else {
array_for_each(overlays, n, overlay) {
tree_ctx *t = tree_open(portroot, overlay);
state.overlay = overlay;
if (t != NULL) {
- tree_foreach_pkg_sorted(t, quse_results_cb,
, NULL);
+ tree_foreach_pkg_sorted(t, quse_results_cb,
+ , state.match);
tree_close(t);
}
}
[gentoo-commits] proj/portage-utils:master commit in: /
commit: d0d205c64d76c416eb83422828e30aea544f4591
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 2 13:34:16 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 2 13:34:16 2020 +
URL:https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d0d205c6
qsize: push query atoms down to tree_foreach_pkg
Signed-off-by: Fabian Groffen gentoo.org>
qsize.c | 24 +++-
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/qsize.c b/qsize.c
index 1f1dfc9..5cf7dae 100644
--- a/qsize.c
+++ b/qsize.c
@@ -109,22 +109,6 @@ qsize_cb(tree_pkg_ctx *pkg_ctx, void *priv)
FILE *fp;
size_t num_files, num_nonfiles, num_ignored;
uint64_t num_bytes;
- bool showit = false;
-
- /* see if this cat/pkg is requested */
- if (array_cnt(state->atoms)) {
- depend_atom *qatom;
-
- qatom = tree_get_atom(pkg_ctx, 0);
- array_for_each(state->atoms, i, atom)
- if (atom_compare(qatom, atom) == EQUAL) {
- showit = true;
- break;
- }
- } else
- showit = true;
- if (!showit)
- return EXIT_SUCCESS;
if ((fp = tree_pkg_vdb_fopenat_ro(pkg_ctx, "CONTENTS")) == NULL)
return EXIT_SUCCESS;
@@ -248,7 +232,13 @@ int qsize_main(int argc, char **argv)
vdb = tree_open_vdb(portroot, portvdb);
if (vdb != NULL) {
- ret = tree_foreach_pkg_fast(vdb, qsize_cb, , NULL);
+ if (array_cnt(atoms) > 0) {
+ array_for_each(atoms, i, atom) {
+ ret = tree_foreach_pkg_fast(vdb, qsize_cb,
, atom);
+ }
+ } else {
+ ret = tree_foreach_pkg_fast(vdb, qsize_cb, ,
NULL);
+ }
tree_close(vdb);
}
[gentoo-commits] proj/devmanual:master commit in: /
commit: 832b6ab7ea3e5239ec1ad850ca08a85dc1cb3bb1
Author: Ulrich Müller gentoo org>
AuthorDate: Thu Jan 2 13:35:35 2020 +
Commit: Ulrich Müller gentoo org>
CommitDate: Thu Jan 2 13:35:35 2020 +
URL:https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=832b6ab7
Makefile: Output a message if tidy succeeded.
Explicitly initialise status, in order to be independent of the
environment.
Signed-off-by: Ulrich Müller gentoo.org>
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 407decf..398d976 100644
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,12 @@ validate: prereq
# We have to loop through them because otherwise tidy won't
# tell you which file contains a mistake.
tidy: $(HTMLS)
- @for f in $(HTMLS); do \
+ @status=0; \
+ for f in $(HTMLS); do \
output=$$(tidy -q -errors --drop-empty-elements no $${f} 2>&1) \
|| { status=$$?; echo "Failed on $${f}:"; echo "$${output}"; }; \
done; \
+ test $${status} -eq 0 && echo "tidy validation successful"; \
exit $${status}
clean:
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel-bin/
commit: b26cada012ec1134770f90e79990d10ccb2744cc
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 13:14:29 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 13:19:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26cada0
sys-kernel/vanilla-kernel-bin: Create linux symlink when none
Signed-off-by: Michał Górny gentoo.org>
.../vanilla-kernel-bin-5.4.7.ebuild| 30 +-
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
index c7f50b935aa..998f07ed5e9 100644
--- a/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
+++ b/sys-kernel/vanilla-kernel-bin/vanilla-kernel-bin-5.4.7.ebuild
@@ -147,19 +147,25 @@ pkg_postinst() {
eend ${?} || die "Installing the kernel failed"
fi
- local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
- local symlink_ver=${symlink_target#linux-}
- if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]]
- then
- local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
- # if the current target is either being replaced, or still
- # installed (probably depclean candidate), update the symlink
- if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
- has_version -r "~${symlink_pkg}"
+ if [[ ! -e ${EROOT}/usr/src/linux ]]; then
+ ebegin "Creating /usr/src/linux symlink"
+ ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
+ eend ${?}
+ else
+ local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
+ local symlink_ver=${symlink_target#linux-}
+ if [[ ${symlink_target} == linux-* && -z
${symlink_ver//[0-9.]/} ]]
then
- ebegin "Updating /usr/src/linux symlink"
- ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
- eend ${?}
+ local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
+ # if the current target is either being replaced, or
still
+ # installed (probably depclean candidate), update the
symlink
+ if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
+ has_version -r "~${symlink_pkg}"
+ then
+ ebegin "Updating /usr/src/linux symlink"
+ ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
+ eend ${?}
+ fi
fi
fi
}
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git-bz/
commit: a9b63e636b8b55977544bfa8ce96c254db3065c2
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 12:06:58 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 13:19:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b63e63
dev-vcs/git-bz: Remove dead live ebuild
Signed-off-by: Michał Górny gentoo.org>
dev-vcs/git-bz/git-bz-.ebuild | 47 ---
1 file changed, 47 deletions(-)
diff --git a/dev-vcs/git-bz/git-bz-.ebuild
b/dev-vcs/git-bz/git-bz-.ebuild
deleted file mode 100644
index c8f2c69685e..000
--- a/dev-vcs/git-bz/git-bz-.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE='sqlite'
-
-EGIT_REPO_URI="git://git.fishsoup.net/${PN}
- http://git.fishsoup.net/cgit/${PN};
-inherit git-r3 python-single-r1
-
-DESCRIPTION="Bugzilla subcommand for git"
-HOMEPAGE="http://www.fishsoup.net/software/git-bz/;
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-vcs/git
- ${PYTHON_DEPS}"
-DEPEND="app-text/asciidoc
- app-text/xmlto"
-
-src_configure() {
- # custom script
- ./configure --prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
- emake ${PN}.1
-}
-
-src_install() {
- default
- python_fix_shebang "${ED%/}"/usr/bin/${PN}
-}
-
-pkg_postinst() {
- if ! has_version dev-python/pycrypto; then
- elog "For Chrome/-ium cookie decryption support, please
install:"
- elog " dev-python/pycrypto"
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
commit: 2fa473a4300a20c9ca881eac6cfec9828d823e9c
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 13:15:04 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 13:19:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa473a4
sys-kernel/vanilla-kernel: Create linux symlink when none exists
Signed-off-by: Michał Górny gentoo.org>
.../vanilla-kernel/vanilla-kernel-5.4.7.ebuild | 30 +-
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.7.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.7.ebuild
index e4705ad0558..37e03a83622 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.7.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.7.ebuild
@@ -255,19 +255,25 @@ pkg_postinst() {
eend ${?} || die "Installing the kernel failed"
fi
- local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
- local symlink_ver=${symlink_target#linux-}
- if [[ ${symlink_target} == linux-* && -z ${symlink_ver//[0-9.]/} ]]
- then
- local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
- # if the current target is either being replaced, or still
- # installed (probably depclean candidate), update the symlink
- if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
- has_version -r "~${symlink_pkg}"
+ if [[ ! -e ${EROOT}/usr/src/linux ]]; then
+ ebegin "Creating /usr/src/linux symlink"
+ ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
+ eend ${?}
+ else
+ local symlink_target=$(readlink "${EROOT}"/usr/src/linux)
+ local symlink_ver=${symlink_target#linux-}
+ if [[ ${symlink_target} == linux-* && -z
${symlink_ver//[0-9.]/} ]]
then
- ebegin "Updating /usr/src/linux symlink"
- ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
- eend ${?}
+ local symlink_pkg=${CATEGORY}/${PN}-${symlink_ver}
+ # if the current target is either being replaced, or
still
+ # installed (probably depclean candidate), update the
symlink
+ if has "${symlink_ver}" ${REPLACING_VERSIONS} ||
+ has_version -r "~${symlink_pkg}"
+ then
+ ebegin "Updating /usr/src/linux symlink"
+ ln -f -n -s linux-${PV} "${EROOT}"/usr/src/linux
+ eend ${?}
+ fi
fi
fi
[gentoo-commits] repo/gentoo:master commit in: sys-kernel/installkernel-gentoo/
commit: d2889b2dfa583c9d8908934cc7239f25f95377b4
Author: Michał Górny gentoo org>
AuthorDate: Thu Jan 2 12:15:50 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Thu Jan 2 13:19:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2889b2d
sys-kernel/installkernel-gentoo: Bump to v2
Signed-off-by: Michał Górny gentoo.org>
sys-kernel/installkernel-gentoo/Manifest | 1 +
.../installkernel-gentoo-2.ebuild | 33 ++
2 files changed, 34 insertions(+)
diff --git a/sys-kernel/installkernel-gentoo/Manifest
b/sys-kernel/installkernel-gentoo/Manifest
index 17cde3f15e0..2777ae2bef2 100644
--- a/sys-kernel/installkernel-gentoo/Manifest
+++ b/sys-kernel/installkernel-gentoo/Manifest
@@ -1 +1,2 @@
DIST installkernel-gentoo-1.tar.gz 2308 BLAKE2B
94d30463445cca4ccea8b00c61dd9f9f89ea4d6f2185e5c1355145300b001fbb624d2e06c9707ecc79ddcab8609725c34239e00b5d80bff22b10a8bc28132916
SHA512
ce33b1958bcec4ed63f812b00471a49ecb88d0149a4e5ebd283b412cc3eafc647477bf84ad21c066ef2602ee06a24ece08fbac85cc815fae91b0bb43d8db8013
+DIST installkernel-gentoo-2.tar.gz 2339 BLAKE2B
0ca4688fac9d27774bc30b7529ed01d9598a73283bd508265a9c694921d7a7974d0d9cda2e0c52fe247b7cbce53918c7b3271fdd01beb150097be0905aec
SHA512
157e5c525c7eee1aa79027b847eb938700197abad087ec25548f6cfde227720936d1512070549993d6db0bb51dcef1bf00156f2316b415fa00e001ce1828e471
diff --git a/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
new file mode 100644
index 000..67b7e78a024
--- /dev/null
+++ b/sys-kernel/installkernel-gentoo/installkernel-gentoo-2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Gentoo fork of installkernel script from debianutils"
+HOMEPAGE="https://github.com/mgorny/installkernel-gentoo;
+SRC_URI="https://github.com/mgorny/installkernel-gentoo/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sh ~sparc ~x86 ~x86-linux"
+
+RDEPEND="
+ >=sys-apps/debianutils-4.9-r1
+ !
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/
commit: c9a514a0bbabe4beb1433c7fcba475d2b114e8f7
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:49:47 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:49:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a514a0
dev-libs/rocm-comgr: Cleanup old versions
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
dev-libs/rocm-comgr/Manifest | 5 ---
dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild | 42 -
dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild | 46 ---
dev-libs/rocm-comgr/rocm-comgr-2.7.0.ebuild | 47
dev-libs/rocm-comgr/rocm-comgr-2.8.0.ebuild | 42 -
dev-libs/rocm-comgr/rocm-comgr-2.9.0.ebuild | 42 -
6 files changed, 224 deletions(-)
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 7b54fec63f8..6ed802333f8 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -1,6 +1 @@
-DIST rocm-comgr-2.10.0.tar.gz 87111 BLAKE2B
efc9d395f6c0445e3f0af847edb66094905b38a8134d05b938a5bc48f1d71d37db664afc8e6125f82a6618cd4657d4316105f6587937010cd120f68c01172cac
SHA512
ce7e698c042291910a27bf261e52ac420dd5f9f676bb86e72b903e8a751753b9b0d2d15fb3dfabafdaef75a94844541b37df81e70db28496545348e93cd4018c
-DIST rocm-comgr-2.6.0.tar.gz 1484343 BLAKE2B
fcb496b4997d672640e3f75622e74085eeb9dfe83c88ae025530389d3cdca7628155168060e71f7a3ff915e933ffe70c7026720dc124d128d16ef4df397525e7
SHA512
b14e90603d2b6e17f6b0335ea35da2e5d7e31710f301d7a7f7751a45d996e3dbbfbf84a03e2e911e8798e72e77b87b5cd88317e897cb4de3ee5cf0e7c3222d68
-DIST rocm-comgr-2.7.0.tar.gz 1500771 BLAKE2B
275ad4cab34d554f8a131101eda474926f7270a44a0af9941d8f1233c29b44b3efb3ba83c6b541d501a3e2fc751c591c0f6a993563bbacf539b5bcd04b23963b
SHA512
afb4a7318c2e137db6ac0502041ed53e63783ec1ab458962b1b16f0f2f28e09ce2ae70d048b858740eca8bf06328858400a68bed4e91d7cfc4b7714a66d85bc9
-DIST rocm-comgr-2.8.0.tar.gz 85502 BLAKE2B
14e18191a475c3d05e324f15e3b2d0829eed56bfa625b48e217e6540836e005675a4ffdd0813664c7f61177431d0987499eb9a75ec83acfa0e554e954770fbc9
SHA512
516832f2a1be5e66d93dddfd1275861605afcb6e3410cb518e6d8647a25c18da058e37cbce8434d5b7133a2147c8c84dc48a485f7b855b74a3b49c9f7dae4a0e
-DIST rocm-comgr-2.9.0.tar.gz 85505 BLAKE2B
5e69bcd2fb6769cd315a18eb626d00161acb4a2f9922eb67dba6cee081c236ec25798011d4112c37d5e6fba06531e5e7b4f42659080a8dd23d9a8579b71bf2c0
SHA512
8e66c01eee71154d261a8f2a8651f90dc7e60b6d74625aab3f3a0b51226c69059cde66d7a1eab8aacee7d0653cc881ec442849483f21616ee4cd27d4ddad7345
DIST rocm-comgr-3.0.0.tar.gz 88594 BLAKE2B
d3fb356962ba6a9ffc7aa295f1582f6587d55d1f4f2a9a978f5c189f4a0597a9cb3f9806a1f2f43f14e262bc19964e06f41df3c7f45ac3c1579511fe235cc940
SHA512
ffa250c44388b1985ec0dac68bf0dd27820933fe7579f7fc6b35d783852cd03fb02919b5e800b01d536c36eb3c5bff96d1a38f5c8ab6380d6584b2e6d19a25fc
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
b/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
deleted file mode 100644
index ff0ede91ae2..000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
-
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/;
- inherit git-r3
- S="${WORKDIR}/${P}/lib/comgr"
-else
-
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/roc-${PV}.tar.gz
-> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-CompilerSupport-roc-${PV}/lib/comgr"
- KEYWORDS="~amd64"
-fi
-PATCHES=(
- "${FILESDIR}/${PN}-2.6.0-find-clang.patch"
- "${FILESDIR}/${PN}-2.6.0-find-lld-includes.patch"
- "${FILESDIR}/${PN}-2.8.0-dependencies.patch"
-)
-
-DESCRIPTION="Radeon Open Compute Code Object Manager"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport;
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocm-device-libs-${PV}
- >=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
b/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
deleted file mode 100644
index c000ce55ab7..000
--- a/dev-libs/rocm-comgr/rocm-comgr-2.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
-
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/;
- inherit git-r3
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-driver/
commit: 1bc2632bfa985ded2f3239bc16408964da8c013a
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:51:38 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:51:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc2632b
dev-libs/rocm-opencl-driver: Cleanup old versions
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
dev-libs/rocm-opencl-driver/Manifest | 4 --
.../rocm-opencl-driver-2.6.0.ebuild| 47 -
.../rocm-opencl-driver-2.7.0.ebuild| 48 --
.../rocm-opencl-driver-2.8.0.ebuild| 47 -
.../rocm-opencl-driver-2.9.0.ebuild| 47 -
5 files changed, 193 deletions(-)
diff --git a/dev-libs/rocm-opencl-driver/Manifest
b/dev-libs/rocm-opencl-driver/Manifest
index 0c91c4d73c2..32dba201591 100644
--- a/dev-libs/rocm-opencl-driver/Manifest
+++ b/dev-libs/rocm-opencl-driver/Manifest
@@ -1,5 +1 @@
DIST rocm-opencl-driver-2.10.0.tar.gz 21380 BLAKE2B
0ffdeb00b8d35a2619f37c6aa5efa53259151b2dfca8fd2dbd2dbaa49c9806599199340043a310cb8b855384d276d482e401ccbdf60cbff8c9efc1a80241df66
SHA512
dc6ba05c2a641c0379590af71ca28425495297b753eb4bcc5ff37f44f15a5d0a7f5477c3a426aa5350df969a6a6dabbeb4a71b3ae4b4ad63abd28b28ec87837e
-DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B
f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1
SHA512
7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097
-DIST rocm-opencl-driver-2.7.0.tar.gz 21312 BLAKE2B
8c7233e8c5de2d92d0604a832475a474e5a171853f435908dbe73ab41d077f9f4c2d7069546b4e660d900c02cccf1f77d85d2fbe5ddb52fdde4c32d6c26910a2
SHA512
ee14bbbf502ffc00fd9e1e04224ae8109c8603d44438cddde8951c2d2caf5d45b94d39eb184af66462b4029759064aab0e2312b44fdd3f925064ebe6097ac49b
-DIST rocm-opencl-driver-2.8.0.tar.gz 21345 BLAKE2B
91ecfaf145cb4c9cc9407ca79d90fc480d25b0d2afd1b0ed7c5af7d970ed729255c7ca0a27a5729640d4ea42a2ce2450fdf5eb92aa124ad95340afea185dcf16
SHA512
d610f0e50714efa159440001a67ec7589fbd366fde953e9c789a737875dcd82a8c30fcefc3825467c1e5db7c53bcc26eb9658f2f71662acd5e021ef117ddf336
-DIST rocm-opencl-driver-2.9.0.tar.gz 21351 BLAKE2B
341e0e648f28740695dd16dc4039c1f800b3225af96a407594ce200fd6f7ff74278a8e80c44b83218cfd9fe76b33ca3b5ab0d3ef4b69156c88a6c063ce650bc0
SHA512
87a304b0864f5d0a09aff0f355d62ccbe3ea2c46f462da7acaec138d013b5e9e1f92d97afb81c86768184e05a26f3dd43d0a63cbdab3a651b410fb8c71bb1882
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
deleted file mode 100644
index 94409347409..000
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/;
- inherit git-r3
-else
-
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz
-> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver;
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-devel/llvm-roc:=
- dev-libs/rocr-runtime"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-install-correctly.patch"
- "${FILESDIR}/${P}-install-header.patch"
-)
-
-src_prepare() {
- # remove unittest, because it downloads additional file from github.com
- sed -e
"s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i
CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
deleted file mode 100644
index 4d9d844cb8f..000
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/;
- inherit git-r3
-else
-
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz
->
[gentoo-commits] repo/gentoo:master commit in: dev-libs/roct-thunk-interface/files/
commit: f453c0a77a69193eadd8e3dccb4bd04d7b8065df
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:54:11 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:54:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f453c0a7
dev-libs/roct-thunk-interface: Remove unused patches
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
...t-thunk-interface-2.0.0-correctly-install.patch | 288 -
...hunk-interface-2.6.0-correctly-install-pc.patch | 25 --
...t-thunk-interface-2.6.0-correctly-install.patch | 25 --
...nterface-2.6.0-do-not-install-kfd_ioctl.h.patch | 25 --
.../roct-thunk-interface-2.6.0-pc-prefix.patch | 22 --
5 files changed, 385 deletions(-)
diff --git
a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.0.0-correctly-install.patch
b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.0.0-correctly-install.patch
deleted file mode 100644
index 8248c5f4b36..000
---
a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.0.0-correctly-install.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/25
-From c60501d7e69db24f5d880aace73662384ea90b27 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider
-Date: Fri, 7 Sep 2018 10:30:05 +0200
-Subject: [PATCH 1/7] cmake: Do not mess with CMAKE_C_FLAGS
-
- CMakeLists.txt | 11 +++
- 1 file changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb2605b..8a0f362 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,15 +59,9 @@ set ( BUILD_VERSION_STRING
"${BUILD_VERSION_MAJOR}.${BUILD_VERSION_MINOR}.${BUIL
- #set ( CMAKE_VERBOSE_MAKEFILE on )
-
- ## Compiler flags
--set ( CMAKE_C_FLAGS "-fPIC -W -Wall -Wextra -Wno-unused-parameter
-Wformat-security -Wswitch-default -Wundef -Wshadow -Wpointer-arith
-Wbad-function-cast -Wcast-qual -Wlogical-op -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls
-Wunreachable-code -std=gnu99 -fvisibility=hidden" )
-+set (HSAKMT_C_FLAGS -fPIC -W -Wall -Wextra -Wno-unused-parameter
-Wformat-security -Wswitch-default -Wundef -Wshadow -Wpointer-arith
-Wbad-function-cast -Wcast-qual -Wlogical-op -Wstrict-prototypes
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls
-Wunreachable-code -std=gnu99 -fvisibility=hidden)
- if ( "${CMAKE_C_COMPILER_VERSION}" STRGREATER "4.8.0")
--set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror" )
--endif ()
--
--if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
--set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2" )
--else ()
--set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g" )
-+set (HSAKMT_C_FLAGS ${HSAKMT_C_FLAGS} -Werror)
- endif ()
-
- set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" )
-@@ -96,6 +90,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
-
- ## Add the library
- add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} )
-+target_compile_options(${HSAKMT_TARGET} PRIVATE ${HSAKMT_C_FLAGS})
-
- ## Set the VERSION and SOVERSION values
- set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION
"${LIB_VERSION_STRING}" )
-
-From d37b3e2e634a40192c113d9a8256f3d2aa24acfa Mon Sep 17 00:00:00 2001
-From: Andreas Schneider
-Date: Fri, 7 Sep 2018 10:31:59 +0200
-Subject: [PATCH 2/7] cmake: Do not mess with CMAKE_SHARED_LINKER_FLAGS
-
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a0f362..a2a36cd 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,7 +67,7 @@ endif ()
- set ( HSAKMT_LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/src/libhsakmt.ver" )
-
- ## Linker Flags
--set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT}
-Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete
-Wl,-no-undefined" )
-+set (HSAKMT_LINK_FLAGS "-Wl,--version-script=${HSAKMT_LINKER_SCRIPT}
-Wl,-soname=${HSAKMT_COMPONENT}.so.$(PROJECT_VERSION_MAJOR) -Wl,-z,nodelete
-Wl,-no-undefined" )
-
- ## Source files
- set ( HSAKMT_SRC "src/debug.c"
-@@ -91,6 +91,7 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/src )
- ## Add the library
- add_library ( ${HSAKMT_TARGET} SHARED ${HSAKMT_SRC} )
- target_compile_options(${HSAKMT_TARGET} PRIVATE ${HSAKMT_C_FLAGS})
-+set_property(TARGET ${HSAKMT_TARGET} PROPERTY LINK_FLAGS ${HSAKMT_LINK_FLAGS})
-
- ## Set the VERSION and SOVERSION values
- set_property ( TARGET ${HSAKMT_TARGET} PROPERTY VERSION
"${LIB_VERSION_STRING}" )
-
-From 7f9ad94a9932319930f96d49a78fa9e741cd7292 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider
-Date: Fri, 7 Sep 2018 10:41:04 +0200
-Subject: [PATCH 3/7] cmake: Use GNUInstallDirs for installtion
-
-This will allow distributions to install it correctly.
- CMakeLists.txt | 13 -
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-comgr/files/
commit: fc7f769a1d485d97e35eed22615bad218fc392d0
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:55:52 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:55:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7f769a
dev-libs/rocm-comgr: Remove unused patches
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
.../files/rocm-comgr-2.6.0-correctly-install.patch | 44 --
.../files/rocm-comgr-2.6.0-dependencies.patch | 38 -
.../files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch | 30
.../rocm-comgr-2.7.0-llvm-interface-change.patch | 176 -
4 files changed, 288 deletions(-)
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
deleted file mode 100644
index 74206760f39..000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-correctly-install.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 98f589636729b1e25625db6880fbd7820dcf9e40 Mon Sep 17 00:00:00 2001
-From: Craig Andrews
-Date: Wed, 31 Jul 2019 10:04:11 -0400
-Subject: [PATCH] Install to standard locations using GNUInstallDirs
-
-Some distributions require 64 bit libraries to be installed to lib64, for
example.
-Using GNUInstallDirs ensures that files are installed to the expected
locations.
- CMakeLists.txt | 8 +---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 454b830..a89af16 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,7 @@
- cmake_minimum_required(VERSION 3.2.0)
-
-+include (GNUInstallDirs)
-+
- # Build ROCM-Compiler-Support with ccache if the package is present.
- set(ROCM_COMPILER_SUPPORT_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache
enabled build")
- if(ROCM_COMPILER_SUPPORT_CCACHE_BUILD)
-@@ -146,17 +148,17 @@ configure_file("cmake/${AMD_COMGR_CONFIG_NAME}.in"
-
- install(TARGETS amd_comgr
- EXPORT amd_comgr_export
-- DESTINATION lib)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- install(FILES
- "include/amd_comgr.h"
-- DESTINATION include)
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
- install(FILES
- "README.md"
- "LICENSE.txt"
- "NOTICES.txt"
-- DESTINATION share/amd_comgr)
-+ DESTINATION ${CMAKE_INSTALL_DATADIR}/amd_comgr)
-
- # Generate the install-tree package.
- set(AMD_COMGR_PREFIX_CODE "
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
deleted file mode 100644
index bce19d168b0..000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-dependencies.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/pull/19
-
comgr/CMakeLists.old 2019-07-19 17:19:26.080276421 +0200
-+++ comgr/CMakeLists.txt 2019-07-19 18:17:25.780163592 +0200
-@@ -185,7 +185,11 @@
- include_directories(./yaml-cpp/include)
-
- set(CLANG_LIBS
-- clangFrontendTool)
-+ clangFrontendTool
-+ clangFrontend
-+ clangBasic
-+ clangDriver
-+ clangSerialization)
-
- set(LLD_LIBS
- lldELF
-@@ -193,8 +197,19 @@
-
- llvm_map_components_to_libnames(LLVM_LIBS
- ${LLVM_TARGETS_TO_BUILD}
-+ Option
- DebugInfoDWARF
-- Symbolize)
-+ Symbolize
-+ Support
-+ Object
-+ BitWriter
-+ MC
-+ MCParser
-+ MCDisassembler
-+ Core
-+ IRReader
-+ CodeGen
-+ Linker)
-
- target_link_libraries(amd_comgr
- PUBLIC
diff --git a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
b/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
deleted file mode 100644
index d61f4c2a200..000
--- a/dev-libs/rocm-comgr/files/rocm-comgr-2.6.0-unbundle-yaml-cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/lib/comgr/CMakeLists.txt b/lib/comgr/CMakeLists.txt
-index 454b830..70e2526 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,12 +90,8 @@ if (UNIX)
- -Wl,--no-undefined)
- endif()
- endif()
-- # FIXME: Remove when yaml-cpp is removed from the build.
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
- else()
- list(APPEND AMD_COMGR_PRIVATE_COMPILE_OPTIONS "/W0" "/wd4244")
-- # FIXME: Make this private once yaml-cpp is removed from the build.
-- add_definitions(-D_HAS_EXCEPTIONS=0)
- endif()
-
- # Windows is strict about visibility of exports in shared libraries, so we ask
-@@ -179,10 +175,8 @@ install(EXPORT amd_comgr_export
- DESTINATION "${AMD_COMGR_PACKAGE_PREFIX}"
- FILE "${AMD_COMGR_TARGETS_NAME}")
-
--set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
--set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
--add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
--include_directories(./yaml-cpp/include)
-+find_package(yaml-cpp REQUIRED)
-+include_directories(${YAML_CPP_INCLUDE_DIR})
-
- set(CLANG_LIBS
- clangFrontendTool)
diff --git
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/files/
commit: df54a6d886d585e4b07181268f715aed752e9506
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:58:45 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:58:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df54a6d8
dev-libs/rocr-runtime: Remove unused patches
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
.../rocr-runtime-2.0.0-cmake-install-paths.patch | 42
.../rocr-runtime-2.8.0-fix_doorbell_map.patch | 57 --
2 files changed, 99 deletions(-)
diff --git
a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
deleted file mode 100644
index 2caeebb2bbb..000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/
-
-commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6)
-Author: Craig Andrews
-Date: Mon Jan 7 21:06:14 2019 -0500
-
-Correctly install the library into the system
-
-Install to standard locations in /usr/{lib,include}/lib (as opposed to
/usr/hsa/{lib,include}/hsa)
-Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs
instead of using "lib" and "include"
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 37a9b09..545f183 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} )
-
- list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
- include ( utils )
-+include ( GNUInstallDirs )
- include ( hsa_common )
-
- ## Find LibElf
-@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release )
- add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND
${CMAKE_STRIP} *.so )
- endif ()
-
--## Create symlinks for packaging and install
--add_custom_target ( hsa-link ALL WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink
../hsa/include/hsa hsa-link )
--add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink
../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link )
--
- ## Set install information
--install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib )
--install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION
hsa/include/hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include
PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa )
--install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link
DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME
${CORE_RUNTIME_LIBRARY}.so )
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION
${CMAKE_INSTALL_LIBDIR} )
-+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}/hsa )
-
- ## Packaging directives
- set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" )
-
diff --git
a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
b/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
deleted file mode 100644
index aef3d297034..000
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.8.0-fix_doorbell_map.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/71
-
-From d2a6ad97eb96a28d8f8b658b26ab94e911886cf2 Mon Sep 17 00:00:00 2001
-From: Sean Keely
-Date: Thu, 5 Sep 2019 20:58:57 -0500
-Subject: [PATCH] Correct doorbell_queue_map allocation.
-
-doorbell_queue_map should be allocated unconditionally.
- core/runtime/amd_gpu_agent.cpp | 22 +++---
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/core/runtime/amd_gpu_agent.cpp b/core/runtime/amd_gpu_agent.cpp
-index 9b79a6b..76df913 100644
a/core/runtime/amd_gpu_agent.cpp
-+++ b/core/runtime/amd_gpu_agent.cpp
-@@ -1182,12 +1182,22 @@ void GpuAgent::SyncClocks() {
- }
-
- void GpuAgent::BindTrapHandler() {
-+ // Make an empty map from doorbell index to queue.
-+ // The trap handler uses this to retrieve a wave's amd_queue_t*.
-+ auto doorbell_queue_map_size = MAX_NUM_DOORBELLS * sizeof(amd_queue_t*);
-+
-+ doorbell_queue_map_ =
(amd_queue_t**)core::Runtime::runtime_singleton_->system_allocator()(
-+ doorbell_queue_map_size, 0x1000, 0);
-+ assert(doorbell_queue_map_ != NULL && "Doorbell queue map allocation
failed");
-+
-+ memset(doorbell_queue_map_, 0, doorbell_queue_map_size);
-+
- if (isa_->GetMajorVersion() == 7) {
- // No trap handler support on Gfx7, soft error.
- return;
- }
-
-- // Disable trap handler on Carrizo until KFD is fixed.
-+ // Disable trap handler on APUs until KFD is fixed.
- if (profile_ == HSA_PROFILE_FULL) {
- return;
- }
-@@ -1195,16 +1205,6 @@ void
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-runtime/files/
commit: 21411d61ef5f01ab8a3fa6a1623636a952c51413
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:58:07 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:58:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21411d61
dev-libs/rocm-opencl-runtime: Remove unused patches
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
...pencl-runtime-2.6.0-unbundle-dependencies.patch | 1233
...ncl-runtime-2.8.0-change-install-location.patch | 146 ---
2 files changed, 1379 deletions(-)
diff --git
a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
deleted file mode 100644
index 379dd11e9f9..000
---
a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-2.6.0-unbundle-dependencies.patch
+++ /dev/null
@@ -1,1233 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ebdfc25..fb1c3eb 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,8 @@ endif()
-
- project(OpenCL-ROCm)
-
-+include (GNUInstallDirs)
-+
- # Add path for custom modules
- set(CMAKE_MODULE_PATH
- ${CMAKE_MODULE_PATH}
-@@ -38,38 +40,28 @@ set(CLANG_ENABLE_STATIC_ANALYZER OFF CACHE BOOL "")
- # override default option value in library and driver
- set(GENERIC_IS_ZERO ON CACHE BOOL ON FORCE)
-
--add_subdirectory(compiler/llvm EXCLUDE_FROM_ALL)
--
--find_package(LLVM REQUIRED CONFIG PATHS ${CMAKE_BINARY_DIR}/compiler/llvm
NO_DEFAULT_PATH)
-+find_package(LLVM REQUIRED CONFIG PATHS ${LLVM_DIR} "/opt/rocm/llvm"
NO_DEFAULT_PATH)
-
- list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
- include(AddLLVM)
-
- add_definitions(${LLVM_DEFINITIONS})
--# TODO: add find_package for Clang and lld, and also use LLVM/Clang variables
got from their config
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/clang/include)
--include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/tools/clang/include)
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/tools/lld/include)
--
--# TODO: move AMDGPU.h header to include folder
--include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/lib/Target/AMDGPU)
--include_directories(${CMAKE_BINARY_DIR}/compiler/llvm/lib/Target/AMDGPU)
--
--if(${USE_COMGR_LIBRARY} MATCHES "yes")
-- set(COMGR_DYN_DLL "yes")
-- add_definitions(-DCOMGR_DYN_DLL="yes")
-- include_directories(${CMAKE_SOURCE_DIR}/compiler/llvm/include)
-- add_definitions(-DUSE_COMGR_LIBRARY)
--else()
-- add_subdirectory(compiler/driver EXCLUDE_FROM_ALL)
--endif()
-+set(USE_COMGR_LIBRARY "yes")
-+find_package(amd_comgr REQUIRED CONFIG)
-+add_definitions(-DUSE_COMGR_LIBRARY)
-+FOREACH(DIR ${LLVM_INCLUDE_DIRS})
-+ include_directories("${DIR}")
-+ include_directories("${DIR}/clang")
-+ include_directories("${DIR}/lld")
-+ # TODO: move AMDGPU.h header to include folder
-+ include_directories("${DIR}/llvm/Target/AMDGPU")
-+ENDFOREACH()
-
- set(BUILD_HC_LIB OFF CACHE BOOL "")
- set(ROCM_DEVICELIB_INCLUDE_TESTS OFF CACHE BOOL "")
- set(AMDGCN_TARGETS_LIB_LIST "AMDGCN_LIB_TARGETS")
- set(AMDGCN_TARGETS_LIB_DEPS "AMDGCN_DEP_TARGETS")
- set(AMDGPU_TARGET_TRIPLE "amdgcn-amd-amdhsa-amdgizcl")
--add_subdirectory(library/amdgcn EXCLUDE_FROM_ALL)
-
- add_subdirectory(compiler/lib/loaders/elf/utils/libelf)
-
-@@ -82,28 +74,6 @@ set(OPENCL_INCLUDE_DIRS
- ${CMAKE_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2)
-
- add_subdirectory(api/opencl/amdocl)
--add_subdirectory(api/opencl/khronos/icd)
--
--add_subdirectory(tools/clinfo)
--
--install(PROGRAMS $ $
--DESTINATION bin/x86_64
--COMPONENT libraries)
--
--install(PROGRAMS $
--DESTINATION lib/x86_64
--COMPONENT applications)
--
--install(PROGRAMS $
--DESTINATION lib/x86_64
--COMPONENT libraries)
--
--install(DIRECTORY
--"${CMAKE_CURRENT_SOURCE_DIR}/api/opencl/khronos/headers/opencl2.2/CL"
--DESTINATION include
--COMPONENT libraries
--USE_SOURCE_PERMISSIONS
--PATTERN cl_egl.h EXCLUDE)
-
- foreach(AMDGCN_LIB_TARGET ${AMDGCN_LIB_TARGETS})
- get_target_property(lib_file_name ${AMDGCN_LIB_TARGET} ARCHIVE_OUTPUT_NAME)
-diff --git a/README.md b/README.md
-index a834965..e319be2 100644
a/README.md
-+++ b/README.md
-@@ -7,13 +7,6 @@ Developer preview Version 2 of the new
- * Supports offline ahead of time compilation today; during the Beta phase we
will add in-process/in-memory compilation.
-
-
--## GETTING REPO
--
--Repo is a git wrapper that manages a collection of git repositories. Install
this tool and add it to the command search PATH:
--
--curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
--chmod a+x ~/bin/repo
--
- ## GETTING THE SOURCE CODE
-
- Main OpenCL™ Compatible Components:
-@@ -26,11 +19,6 @@ Main OpenCL™ Compatible Components:
- * https://github.com/RadeonOpenCompute/lld
- *
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-device-libs/
commit: cfb6938b949de4531b431c5dccc420c174eeba48
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:50:48 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:50:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb6938b
dev-libs/rocm-device-libs: Cleanup old versions
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
dev-libs/rocm-device-libs/Manifest | 5
.../rocm-device-libs-2.10.0.ebuild | 34 --
.../rocm-device-libs/rocm-device-libs-2.6.0.ebuild | 34 --
.../rocm-device-libs/rocm-device-libs-2.7.0.ebuild | 34 --
.../rocm-device-libs/rocm-device-libs-2.8.0.ebuild | 34 --
.../rocm-device-libs/rocm-device-libs-2.9.0.ebuild | 34 --
6 files changed, 175 deletions(-)
diff --git a/dev-libs/rocm-device-libs/Manifest
b/dev-libs/rocm-device-libs/Manifest
index 3e7386640d5..262b16eba6d 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -1,6 +1 @@
-DIST rocm-device-libs-2.10.0.tar.gz 227626 BLAKE2B
a5a17f1ed4699f613523bc39bd25a566bafe53865025ccdf84cca1210d26da1f97e989d8acc35626cb21296b3c004adc6e1a985c8096c4de88c4f42b6abbb9a3
SHA512
1863f797c369b6f4097e3c966ce4f371da5f87893ffeb2d596dbb0b31aa3f6142e7359bcaf6e884754bf7a5ae246df674cd1020ca8c8e9114605ac7300715641
-DIST rocm-device-libs-2.6.0.tar.gz 221981 BLAKE2B
6350fafb31453daf015886bc2d3d2ba59b805fafdf12372fcad8f328c9e7c74d4e54093817b07961d7be77b990780038f7a7b91d5ab63650a92bf107e0be4a40
SHA512
4262c956ea8c212c2707acf74ee27f609a6faee1bee7c3fd436b2a4adbedf1b072b611e6143cc315bd4e9d1e306d874aa0f4629cff9301bd28be65fd16867180
-DIST rocm-device-libs-2.7.0.tar.gz 226395 BLAKE2B
85c5b7ebfca1570d9653428d4aa7052f784443c774b224b563471638caac01f9d800d0bb5d52dace2b54a447cfc00c0f39ed87ab1612f1e382fbba10c5e30e80
SHA512
2277ff4037b25d32b473b3b046708b2ce4aeb28c1df7ed4ce51893c204e5409c931083b3ecc38c6796581c1233e0d25dd0f0c5710961be8d1d60118e9a1de88a
-DIST rocm-device-libs-2.8.0.tar.gz 227320 BLAKE2B
5263acd01cd9e1002a3991232b704bfa0675d8a825b47ae9a09e1b0acadbebaeb0a61fe3df1880027a65006d4065e6d75de093c0516d41e6fd78618b08b1d258
SHA512
8c3b16096e325c9f4bc74bbd189f73c178b93b011492a9c0c38017cd53b4afef55e8f55a36c596272b7dda91811ef83ed4e1d0cbb0a623eb5647012e72a64524
-DIST rocm-device-libs-2.9.0.tar.gz 227785 BLAKE2B
903e1139d0813aaef298911a7e3c9c63c3141355c404a282ec0c1eb2532ded0d303f0550cfd142d8fc9a6219160755e658efd0d7d69302ecb23997314e502873
SHA512
d68820a6450d9b402a427df365dbd6be32e711f24256b68b887df8c78cb774c85b0a55f6033afbb7e97c951ad9cd83637194fbf5f575c2a9c8a68ea20e0bd046
DIST rocm-device-libs-3.0.0.tar.gz 227811 BLAKE2B
8fb866611e82126b5909b75282081371ddeea58a34d732586e43dcf23d512fb8f2ad259f2c9227e35730af0d0d2b235895aa5396a7d19c2987754162d2ed6f49
SHA512
257f8990d93bf8cb0438fa15d7ca91a7f38082c90f0bb96b0691196ec78f16e790142ecef0089bc765edf80c1f0b644210e991a7e6f7e8dfab33cedad6465fa3
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
b/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
deleted file mode 100644
index e0264de7479..000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/;
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
-
SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/roc-ocl-${PV}.tar.gz
-> ${P}.tar.gz"
- S="${WORKDIR}/ROCm-Device-Libs-roc-ocl-${PV}"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Device Libraries"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs;
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
- >=sys-devel/llvm-roc-${PV}:="
-DEPEND="${RDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
b/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
deleted file mode 100644
index 91d53a41976..000
--- a/dev-libs/rocm-device-libs/rocm-device-libs-2.6.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/;
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-runtime/
commit: 17605024c79d00a7dd3a34d3f59e9a5d7879d82f
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:52:30 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:52:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17605024
dev-libs/rocm-opencl-runtime: Cleanup old versions
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
dev-libs/rocm-opencl-runtime/Manifest | 5 --
.../rocm-opencl-runtime-2.10.0.ebuild | 57 -
.../rocm-opencl-runtime-2.6.0-r1.ebuild| 51 ---
.../rocm-opencl-runtime-2.8.0.ebuild | 57 -
.../rocm-opencl-runtime-2.9.0-r1.ebuild| 58 --
.../rocm-opencl-runtime-2.9.0.ebuild | 57 -
6 files changed, 285 deletions(-)
diff --git a/dev-libs/rocm-opencl-runtime/Manifest
b/dev-libs/rocm-opencl-runtime/Manifest
index 3e9db010b8e..6152f1dbd39 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -1,7 +1,2 @@
DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248
BLAKE2B
7c311d98e5a209d01f1f1dbad7471ceb3de66e10f7cee48686ed176efcde1e7ba48ea12bdbf2af61d5f72e5b8eda69b2fae6829d265a8b88ad46c4ec4995d8d4
SHA512
5033d6fb0ef2515e56b0d9c31baf6fe02e90613989c417fbde20efd79e0ac2841df1a98ff799e60cc469b79244cdc756d15950df6c9baead7d31febe7cad0418
-DIST OpenCL-ICD-Loader-bc9728edf8cace79cf33bf75560be88fc2432dc4.tar.gz 62858
BLAKE2B
931fb7ade12debda99512d8b9fbfb987f47e3b68568863e480de406f842a014d39f0321c44420fb8b68b8757d49cc02cadf82e767c9d2b71e53bdb8e9763cace
SHA512
2ab9035fbc0a80a529d1b2f454b0b9a263b6eff601121750e81e2e32581f06189566cdcf201ab741ff3f1491ead825a7858000901f8042af67b1304be622e9fa
-DIST rocm-opencl-runtime-2.10.0.tar.gz 965836 BLAKE2B
2eeb3449939389d684b016a5eabfbac6491079d4a2ebb78ef3baeb47dcd0e6e2f4e32fb788ad28f704f2564b463759b8e433517eb6bb63d3c3d43d25e524f846
SHA512
c5142391bb2d0ff92c509745da63eda8ebdbf2dd7223dbd545e394b5b716b4f0c666de3ab48f0eae94f51967185930cdf1f0cc4822d24932a2473c1a2db5f76c
-DIST rocm-opencl-runtime-2.6.0.tar.gz 986155 BLAKE2B
43469ec3a368e2ee9716a38d08df48c28165a233bd80de54f286011df25782a197e252e8e41ffa8f59eecf93d6beae5434497e8d4b648676252d32a0859ba59a
SHA512
d29bf23f93440135786600cca28a806714bb207b7ad0947d26471fa38470820e7801acc8438d43d55ff2ec1d95cee9e64b500628b6a3b026744c67df
-DIST rocm-opencl-runtime-2.8.0.tar.gz 976851 BLAKE2B
4191c2f027f615a8ba7a38d30364549df509e6bd432e5bfe3d30d40fb6bade15b58fe824b5aa9704e5d93421f28e1067d283738fa85e7ec59a444f5be25c963c
SHA512
6c070d3e2f455d96f028f614f0562c0b8983b457c6295c398d6d4574133d4a7384573caa1f32e39550887861aa09aa19c9e34fc8bbae6ddc41ae395969d33540
-DIST rocm-opencl-runtime-2.9.0.tar.gz 980980 BLAKE2B
b72c9659ca8ac6b12d0c5c8c204a2a481c9e057e1b6aa80e24b57e141538c345025bfe74143ee2450bb013ff1b45a314538965fdc071a6e925967368baabfb94
SHA512
9d9742da94d4dd7326e6f64042418726f8fcaa05b3a02b6a7760b2f17067747a2a5f37183a4245697211ceb21e4fa0870dfeca9970b4fd3794985311d6ff7d0f
DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B
2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45
SHA512
2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild
b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild
deleted file mode 100644
index f62a0a3951c..000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-2.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
-SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz
-> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
-if [[ ${PV} == * ]] ; then
-
EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/;
- inherit git-r3
-else
- SRC_URI+="
https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz
-> ${P}.tar.gz"
- KEYWORDS="~amd64"
- S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}"
-fi
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime;
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND=">=dev-libs/rocr-runtime-${PV}
- >=dev-libs/rocm-comgr-${PV}
- >=dev-libs/rocm-device-libs-${PV}
- >=dev-libs/rocm-opencl-driver-${PV}
- dev-libs/ocl-icd[khronos-headers]"
-DEPEND="${RDEPEND}
- dev-lang/ocaml
- dev-ml/findlib"
-
-PATCHES=(
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/
commit: 6089a3c6271ad799c49de31803521f4bceba61a7
Author: Craig Andrews gentoo org>
AuthorDate: Thu Jan 2 12:53:24 2020 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Jan 2 12:53:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6089a3c6
dev-libs/rocr-runtime: Cleanup old versions
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Craig Andrews gentoo.org>
dev-libs/rocr-runtime/Manifest | 6
dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild| 34 ---
dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild | 37 -
dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild | 34 ---
dev-libs/rocr-runtime/rocr-runtime-2.7.0.ebuild| 37 -
dev-libs/rocr-runtime/rocr-runtime-2.8.0-r1.ebuild | 38 --
dev-libs/rocr-runtime/rocr-runtime-2.8.0.ebuild| 37 -
dev-libs/rocr-runtime/rocr-runtime-2.9.0.ebuild| 37 -
8 files changed, 260 deletions(-)
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 49064ebf53b..ff5165ff39b 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,7 +1 @@
-DIST rocr-runtime-2.0.0.tar.gz 313087 BLAKE2B
5fe5ea99728f7d7337c9e8a174a31d4ca8bdd559fad3400955ba6d86947d5bf9004094d78548cab2cb2089bfd028d0e4dfdd4d5fd7b41bed73feeebf2f33b705
SHA512
662d3d8fff8aeb17557df67207d885edc1266bb9800ec46ecab28bbd6ace7fbffb9e4092d74beb0366cacfe8873b1b257bcf2f8345d81a9b6657a7adcfc53c0c
-DIST rocr-runtime-2.10.0.tar.gz 325165 BLAKE2B
482fde76d909e40478237ade1dcf9c0d28e1d6b9f541876d91f513d68c1882ae823d08b852a7c1b112ebace68f7860305cb962aeb79d7a4e8ef9a0ad249c69b5
SHA512
92ae7ff016bec7f8c5e781633d95a01e6b3e3aee5ad702d9e5b329d8b4141722328a17a67327f4aace747cce3e22a53d1e21d304dfcd2d83dd71f2da113adfd2
-DIST rocr-runtime-2.6.0.tar.gz 318296 BLAKE2B
c04e04db32f650def8a7973fa73f0c0e9b99412b13676a05e9c4283ea07958ffe14f7c54002db469ddfd506f349087bd66fff138b7e7b19c41f4ca8789a7c384
SHA512
3b88cf4e1cb6fca6b4361a612abc2c02466d4f716838665d02f16b6fa975b5f69795622d6b96a01b796165980d2888be7eedd77957a7fd44fac19a0ea581f6b8
-DIST rocr-runtime-2.7.0.tar.gz 321669 BLAKE2B
99f7a62019aaa893ff032a7ed492720c1d0d8fc2c8a730f2e6833d1ad34af57e1045ed480a7d5ba72123bebfa6accd6282be4299bf94d77404adc5bbc9d13624
SHA512
46926a711665df4e232a6dcbcb1f67a4a133bffac927b70404e3cefe624be31dfc5ffea49ae9b834076cfcdf94a6e61b6804af6aed75f433e1842c980bc6e54d
-DIST rocr-runtime-2.8.0.tar.gz 324868 BLAKE2B
5c46ffec7482e09032c67270a352543465f9f8a0a7c45e9884c37104e9e12a7e4dccb60bf3904d1398ffc00d9e934fc055190ba9ba4c1104bdb83be6c758eded
SHA512
428b7d1d17a82c841a4d9a2c163670464416afa3ca3c579cc63ee712880940c0150e365922ffdafa44ee81fb76295cc19b66a1a4cb0a7e9a366f56782d826061
-DIST rocr-runtime-2.9.0.tar.gz 323220 BLAKE2B
7e6338185f23011ed4105c6797431677e657c6fc198f83399daab4d3b2debd6e86c0d669bf794f984ea0346b8e528449eb5d81aff2ecf3f1871663458df6
SHA512
fa68fde0f79651956096ee506ff8b6760a9623e7d9cb099229b3951b7434bed5b501a3c6785c5767902c7dbf6c478ada5d2c2a5c5984063f0d0d0db8bca2bda2
DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B
0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab
SHA512
e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild
b/dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild
deleted file mode 100644
index d75707a03ba..000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ ${PV} == * ]] ; then
- EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/;
- inherit git-r3
- S="${WORKDIR}/${P}/src"
-else
-
SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz
-> ${P}.tar.gz"
- S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src"
- KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime;
-PATCHES=(
- "${FILESDIR}/${P}-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-
-RDEPEND="sys-process/numactl"
-DEPEND="${RDEPEND}
- dev-libs/roct-thunk-interface"
-
-src_prepare() {
- sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i
CMakeLists.txt || die
- cmake-utils_src_prepare
-}
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
b/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
deleted file mode 100644
index 507d471dc10..000
--- a/dev-libs/rocr-runtime/rocr-runtime-2.10.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-#
