[gentoo-commits] proj/catalyst:master commit in: catalyst/base/
commit: cd58b37bcd07433e93b80b4a93c9e79ec9395e26
Author: Matt Turner gentoo org>
AuthorDate: Fri May 1 05:55:43 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri May 1 05:55:43 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cd58b37b
catalyst: Access setarch data correctly
This prevented the setarch data in the TOML files from being applied
correctly.
Fixes: b368f6aa5e29 (catalyst: Use arch data from TOML, not python
modules)
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index affdabbe..7c82029a 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -95,7 +95,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
# Search for a subarchitecture in each arch in the arch_config
for arch in [x for x in arch_config if x.startswith(name) and
host in arch_config[x]]:
self.settings.update(arch_config[arch][host])
-setarch = arch_config.get('setarch', {})
+setarch = arch_config.get('setarch', {}).get(host, {})
break
else:
# Didn't find a matching subarchitecture, keep searching
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/
commit: da6b5588339ecc72fb9093cd2c2f390caaed9a40
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri May 1 04:59:15 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri May 1 04:59:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6b5588
dev-java/tomcat-native: bump to 1.2.24
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/tomcat-native/Manifest| 1 +
dev-java/tomcat-native/tomcat-native-1.2.24.ebuild | 62 ++
2 files changed, 63 insertions(+)
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index c6a2d4c861c..fb6d74b65a9 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1 +1,2 @@
DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B
b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52
SHA512
89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
+DIST tomcat-native-1.2.24-src.tar.gz 419572 BLAKE2B
572f6d64b8f4c22ed1ab68efcec5cd1c57fe01e7b0830dea979039cb702a2930458e7bb31abdeddcacc6d673513c896ca46d28ece681c6c42938498351962b36
SHA512
5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
new file mode 100644
index 000..2dd1db52c69
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.24.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better
performance"
+HOMEPAGE="https://tomcat.apache.org/;
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/apr:1=
+ dev-libs/openssl:0=
+ >=virtual/jre-1.8"
+
+DEPEND=">=virtual/jdk-1.8
+ test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+ local myeconfargs=(
+ --with-apr="${EPREFIX}"/usr/bin/apr-1-config
+ --with-ssl="${EPREFIX}"/usr
+ )
+
+ cd native || die
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ eant jar
+
+ cd native || die
+ default
+}
+
+src_install() {
+ java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+ cd native || die
+ default
+
+ ! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+pkg_postinst() {
+ elog "For more information, please visit"
+ elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html;
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/
commit: c87141f9851ea42f46140d19bc8979225a8f5aa2
Author: Hans de Graaff gentoo org>
AuthorDate: Fri May 1 04:58:13 2020 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri May 1 04:58:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c87141f9
app-admin/puppet: add 5.5.20
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Hans de Graaff gentoo.org>
app-admin/puppet/Manifest | 1 +
app-admin/puppet/puppet-5.5.20.ebuild | 140 ++
2 files changed, 141 insertions(+)
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 50353f784eb..beee569ac65 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,2 +1,3 @@
DIST puppet-5.5.19.tar.gz 2993740 BLAKE2B
aa6bde89489279769ee9a1ed5508fb223f7f0153b1b1991970018908eee70ff0816688c702b8dc779d01e1978ea7f9290c80523648730d5408a17674c11345fd
SHA512
996fa155ca04c8c3c96c29cf65cd24eaf9e19e89fcf85345509dbd3673b28c263df5b62d6f016b8ac1c1da8ed86f0acf3100eae2656252bb10c542972db81de3
+DIST puppet-5.5.20.tar.gz 2995117 BLAKE2B
f147be28967da748bf8d5f7250eae9045caafaa3925f850cc0a77acc19a6a47ed92d4ec81278334608839f6f8c83cab19324f2753bc05d3a042a3bfaccb72a46
SHA512
83b8f234697e13d6fd8ac16634fff4e4adfece70858c32c1001925c71cc4d9a482da1880c27c08e796facb46d5d17889f9521121a69cb49e160e3c031ad564c4
DIST puppet-6.14.0.tar.gz 2842351 BLAKE2B
db9a467d8e0f4f25d45c2f735ee9d11ac6ed4e47c16b95ded3ff9f1c5055ea866735bcda27c19c2988035d9592035e433ef0d79a19781c99f4e97388edf46b93
SHA512
066ad8de6393cb58b1f92fae450dc72dabcbe912cdbb3417848a66955fe17696a68abf67d86b107a2b1c54e7037d38da7264a9234a8833b56065c8e407ff57a4
diff --git a/app-admin/puppet/puppet-5.5.20.ebuild
b/app-admin/puppet/puppet-5.5.20.ebuild
new file mode 100644
index 000..92e56e9b375
--- /dev/null
+++ b/app-admin/puppet/puppet-5.5.20.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="https://puppet.com/;
+SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz;
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+ >=dev-ruby/hiera-3.2.1:0
+ >=dev-ruby/facter-3.0.0
+ >=dev-ruby/fast_gettext-1.1.2:0
+ >=dev-ruby/locale-2.1:0
+ >=dev-ruby/multi_json-1.10:0
+ augeas? ( dev-ruby/ruby-augeas )
+ diff? ( dev-ruby/diff-lcs )
+ doc? ( dev-ruby/rdoc )
+ ldap? ( dev-ruby/ruby-ldap )
+ shadow? ( dev-ruby/ruby-shadow )
+ sqlite? ( dev-ruby/sqlite3 )
+ virtual/ruby-ssl
+ dev-ruby/hocon"
+
+ruby_add_bdepend "
+ doc? ( dev-ruby/yard )
+ test? (
+ dev-ruby/mocha
+ dev-ruby/rack
+ dev-ruby/rspec-its
+ )"
+# this should go in the above lists, but isn't because of test deps not being
keyworded
+# dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+ rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+ selinux? (
+ sys-libs/libselinux[ruby]
+ sec-policy/selinux-puppet
+ )
+ vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+ >=app-portage/eix-0.18.0
+ acct-user/puppet
+ acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+ # Avoid spec that require unpackaged json-schema.
+ rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+ # fix systemd path
+ eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+ # Avoid specs that can only run in the puppet.git repository. This
+ # should be narrowed down to the specific specs.
+ rm spec/integration/parser/compiler_spec.rb || die
+
+ # Avoid failing spec that need further investigation.
+ rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}"
"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ # systemd stuffs
+ insinto /usr/lib/systemd/system
+ doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+ # tmpfiles stuff
+ insinto /usr/lib/tmpfiles.d
+ newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+ # openrc init stuff
+ newinitd "${FILESDIR}"/puppet.init-4.x puppet
+ newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+ newconfd "${FILESDIR}"/puppetmaster.confd
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/munin/
commit: b2ca940373f55e1a50abb9aa711748da94dbb97e
Author: Hans de Graaff gentoo org>
AuthorDate: Fri May 1 04:56:31 2020 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri May 1 04:58:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ca9403
net-analyzer/munin: add 2.0.61
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Hans de Graaff gentoo.org>
net-analyzer/munin/Manifest| 2 +
net-analyzer/munin/munin-2.0.61.ebuild | 417 +
2 files changed, 419 insertions(+)
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index c99159b3c8c..afd8481757c 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -6,3 +6,5 @@ DIST munin-2.0.57-gentoo-1.tar.xz 3980 BLAKE2B
5aae9c29befa761f797d362c90d810051
DIST munin-2.0.57.tar.gz 2272894 BLAKE2B
8daff79d4c9224d83ea91d4583a1c11cdc0d2de05c536da5717cf31555f1d2c87475e4de541688e4b542267a6b8a534911149a7edd6469bd13de79838fae3aed
SHA512
d00cfaf450dc4be5fe52f30440fc14ee49f021fe46c1a641ffd2e60682056051b6b2fc8713bd14ae9f9e5aaf28dbf335b6a2e9ec53f851817442c069298c
DIST munin-2.0.59-gentoo-1.tar.xz 3980 BLAKE2B
5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea
SHA512
b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
DIST munin-2.0.59.tar.gz 2276011 BLAKE2B
0681cd838daaa056418258d473825642e2aa6b7a3ac7a435859033a467351145be73df327d3149b46c53f5a04c602bea57bc5af428cafb7b5bf1e9c780915ddf
SHA512
5597db797f7a0de3581a17be13b079a3fd1e50903014d67d81a262e921fdfca84eee8ec65e3927438db0e01525d16faaabc7e3f7d4cad1a73e7e14002b10478f
+DIST munin-2.0.61-gentoo-1.tar.xz 3980 BLAKE2B
5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea
SHA512
b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851
+DIST munin-2.0.61.tar.gz 2254571 BLAKE2B
e73fb6fc4f71c8d56a7e8a05852f699c94a7cf321b8034ad31ccbd06a37a602e6d312c0079fcb31afc5489a265a35a68c037743e01471ca950223d5cb6757b64
SHA512
ea6ae5a7f812985e0179dc2fe2f21136ecf6152ec2adf48d53e4fa19cfc14e74befe56c77a18f27ba966c12034a4fea442d5d1498a7cfe57ed052d332c199019
diff --git a/net-analyzer/munin/munin-2.0.61.ebuild
b/net-analyzer/munin/munin-2.0.61.ebuild
new file mode 100644
index 000..b111ae5e6fd
--- /dev/null
+++ b/net-analyzer/munin/munin-2.0.61.ebuild
@@ -0,0 +1,417 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PATCHSET=1
+
+inherit java-pkg-opt-2 systemd
+
+MY_P=${P/_/-}
+
+DESCRIPTION="Munin Server Monitoring Tool"
+HOMEPAGE="http://munin-monitoring.org/;
+SRC_URI="
+ https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz ->
${P}.tar.gz
+ https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test
cgi ipv6 syslog ipmi http dhcpd doc apache2"
+REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"
+RESTRICT="!test? ( test )"
+
+# Upstream's listing of required modules is NOT correct!
+# Some of the postgres plugins use DBD::Pg, while others call psql directly.
+# Some of the mysql plugins use DBD::mysql, while others call mysqladmin
directly.
+# We replace the original ipmi plugins with the freeipmi_ plugin which at
least works.
+DEPEND_COM="
+ acct-user/munin
+ acct-user/munin-async
+ acct-group/munin
+ dev-lang/perl:=[berkdb]
+ dev-perl/DBI
+ dev-perl/Date-Manip
+ dev-perl/File-Copy-Recursive
+ dev-perl/List-MoreUtils
+ dev-perl/Log-Log4perl
+ dev-perl/Net-CIDR
+ dev-perl/Net-DNS
+ dev-perl/Net-Netmask
+ dev-perl/Net-SNMP
+ dev-perl/Net-Server[ipv6(-)?]
+ virtual/perl-Digest-MD5
+ virtual/perl-Getopt-Long
+ virtual/perl-MIME-Base64
+ virtual/perl-Storable
+ virtual/perl-Text-Balanced
+ virtual/perl-Time-HiRes
+ apache2? (
www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite]
)
+ asterisk? ( dev-perl/Net-Telnet )
+ cgi? (
+ dev-perl/FCGI
+ dev-perl/CGI-Fast
+ )
+ dhcpd? (
+ >=net-misc/dhcp-3[server]
+ dev-perl/Net-IP
+ dev-perl/HTTP-Date
+ )
+ doc? ( dev-python/sphinx )
+ http? ( dev-perl/libwww-perl )
+ irc? ( dev-perl/Net-IRC )
+ ldap? ( dev-perl/perl-ldap )
+ kernel_linux? ( sys-process/procps )
+ memcached? ( dev-perl/Cache-Memcached )
+ mysql? (
+ virtual/mysql
+
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/parser/
commit: 56b55660458eed8c2cd5fe8e329d100eb36cbe54
Author: Hans de Graaff gentoo org>
AuthorDate: Fri May 1 04:45:24 2020 +
Commit: Hans de Graaff gentoo org>
CommitDate: Fri May 1 04:58:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b55660
dev-ruby/parser: add 2.7.1.2
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Hans de Graaff gentoo.org>
dev-ruby/parser/Manifest | 1 +
dev-ruby/parser/parser-2.7.1.2.ebuild | 32
2 files changed, 33 insertions(+)
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 9c00f7d71a1..dffc73de865 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -4,3 +4,4 @@ DIST parser-2.7.0.4.gem 726016 BLAKE2B
168462c98cf21563cfef07783a8723201aea5ffce
DIST parser-2.7.0.5.gem 726016 BLAKE2B
556d4b580f7efcdec484646db59b623f9f40b0959e8751b2cbbfcf3fa84c0e82dac06d2df88df77b4d1d973c56e17190a1da85523485d4a36feee4042890dbac
SHA512
5358c7004ca06ee50f38906145a1d357b49a23f1ce461b72b8cb5558e91aee18b87fe5eafa7df1b356d47a3ddacbb7cdff8fc516470ea6ad6532be1782c05a82
DIST parser-2.7.1.0.gem 726016 BLAKE2B
55386c4d2107230e17d1bce7997c15512024d93e65e21ca7d1e850e433dcaf7daa75d180967b40c109d3361824c3d9e1c6ef992602c6eec3b7a2c9679993bc72
SHA512
f6e4e814836798045c9eadf84aefe0394b0e8b3dc47d9e6c0e7e372cc4ad13653a45aac10c03e94f79a879b99cb43eaf8cdc4a899a41d463ecae76205d2943a7
DIST parser-2.7.1.1.gem 727040 BLAKE2B
5deb439440cff0f95cfa99969a70c926a82bb0d30f842f0a0915e2e1b7dc6eb4c12e059e8b2f8882b2f772777d611de7ea9133f68a6b0a5954c6446f2dafd1c3
SHA512
29345f4cdbc424e07184b97c4dfab39be2b61f5ae57dba53ee8775fa0251b23f01375f281922f65c64cb0f6998f87144e685db2c9e0815ea7747ea573fa38f56
+DIST parser-2.7.1.2.gem 782848 BLAKE2B
87a0ca30fe277d88a8ef013c450ab2823469a723906ecd67f4ed859e016d5df25b1c976a47c2333e538b7e8b99ce948e58f51a1a21c7686439382ff1e11e5222
SHA512
74c44c64d305de18de745ab09f63041d73435aa4c5a07042178a8a6a35cfdef30e1b55c02c7e7dc97469b8c46a705159a4f746da1c3b3f3a74df1d2d830ddcd3
diff --git a/dev-ruby/parser/parser-2.7.1.2.ebuild
b/dev-ruby/parser/parser-2.7.1.2.ebuild
new file mode 100644
index 000..a1dfc9b62aa
--- /dev/null
+++ b/dev-ruby/parser/parser-2.7.1.2.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"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
+HOMEPAGE="https://github.com/whitequark/parser;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-ruby/minitest:5
+ dev-ruby/racc
+ dev-ruby/cliver )"
+ruby_add_rdepend "=dev-ruby/ast-2.4*"
+
+all_ruby_prepare() {
+ sed -i -e "/[Bb]undler/d" Rakefile || die
+ sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
+}
[gentoo-commits] repo/gentoo:master commit in: net-vpn/ocserv/
commit: 275f49aae323245e399c2d401be4da8cc461a5c6
Author: Mike Gilbert gentoo org>
AuthorDate: Fri May 1 04:56:25 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri May 1 04:56:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275f49aa
net-vpn/ocserv: bump to 1.0.1
Signed-off-by: Mike Gilbert gentoo.org>
net-vpn/ocserv/{ocserv-1.0.0.ebuild => ocserv-1.0.1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-vpn/ocserv/ocserv-1.0.0.ebuild
b/net-vpn/ocserv/ocserv-1.0.1.ebuild
similarity index 100%
rename from net-vpn/ocserv/ocserv-1.0.0.ebuild
rename to net-vpn/ocserv/ocserv-1.0.1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-vpn/openconnect/
commit: 75a15c5715d8a5393efb8ffed12ae5c1f906ba49
Author: Mike Gilbert gentoo org>
AuthorDate: Fri May 1 04:26:51 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri May 1 04:27:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a15c57
net-vpn/openconnect: bump to 8.09
Signed-off-by: Mike Gilbert gentoo.org>
net-vpn/openconnect/Manifest| 1 +
net-vpn/openconnect/openconnect-8.09.ebuild | 147
2 files changed, 148 insertions(+)
diff --git a/net-vpn/openconnect/Manifest b/net-vpn/openconnect/Manifest
index f28d52e86ef..c8fc40caedd 100644
--- a/net-vpn/openconnect/Manifest
+++ b/net-vpn/openconnect/Manifest
@@ -1,3 +1,4 @@
DIST openconnect-8.06.tar.gz 2030905 BLAKE2B
d9659e4f027e11a0348c1c4358831e5f470f0305e04c22716010c68810ae300a7062ab8f57e3fc80b7d90caf855ce2f1c0af1b04eb7032b70486eee2eacc47e5
SHA512
6319aa6b20bf16994b376c2cc2a7cbf2b26a36f35e9607c1886e8fa7a2e1fe111bfb37f9349693ef52a3d2ce718c37e15fe263664e6c0bcbd33ced5ddb9e31b2
DIST openconnect-8.08.tar.gz 2038269 BLAKE2B
78e76aee1d22179dc1e8fff03e57ee5df0d7a04cf88c5f844ba5b87c9b8a0f89766489e0dcc6b1023c07ea8b2e4da8ea2723470423b3c0c8d4bc47ed1c1e3fa4
SHA512
3bf42e194b88f06bbc6c385002e7b76952964e230fc86ee1d803be72204073ffe41286a3d8e189456fd7b905fa63577e6adc64137e893eccada80419c114eeb8
+DIST openconnect-8.09.tar.gz 2083279 BLAKE2B
4588c693a7a641faad271b034e8713f00fda04a872641e45a8ce3e1a236b8d2f4e1b8d973d20e7a9fc656f9460a0e990cbaada008d4ecf9a46353f20c25ac87a
SHA512
f6890f5bce4b36b162e4590bce8a61d65fc0ae803d62a3dd408fbb13e96ce41b6443740132808491093032545aea919f9076e34bc11160c503c5e3c46457e7bd
DIST vpnc-scripts-20200226.tar.gz 21460 BLAKE2B
8f00ce3dc49725758abce27f3688946df1bbd4e92769ef02aa9ee66db8b9f41bef3442eaa5405ab1467476899c6d364dfea898ed924ca83497823a85515d48e5
SHA512
3a1eac4ccfaefb0f837189c8cef696b33ab8b8a68cb50a3ad29206b708d0aa479e8eed0c09bef6f60d056cd98d63cc898a1609d734030a63df3be2cfa6c00f9a
diff --git a/net-vpn/openconnect/openconnect-8.09.ebuild
b/net-vpn/openconnect/openconnect-8.09.ebuild
new file mode 100644
index 000..85ac062266b
--- /dev/null
+++ b/net-vpn/openconnect/openconnect-8.09.ebuild
@@ -0,0 +1,147 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_REQ_USE="xml"
+
+inherit linux-info python-any-r1
+
+if [[ ${PV} == ]]; then
+ EGIT_REPO_URI="https://gitlab.com/openconnect/openconnect.git;
+ inherit git-r3 autotools
+else
+ ARCHIVE_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz;
+ KEYWORDS="~amd64"
+fi
+VPNC_VER=20200226
+SRC_URI="${ARCHIVE_URI}
+
ftp://ftp.infradead.org/pub/vpnc-scripts/vpnc-scripts-${VPNC_VER}.tar.gz;
+
+DESCRIPTION="Free client for Cisco AnyConnect SSL VPN software"
+HOMEPAGE="http://www.infradead.org/openconnect.html;
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5"
+IUSE="doc +gnutls gssapi libproxy lz4 nls smartcard static-libs stoken test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/libxml2
+ sys-libs/zlib
+ !gnutls? (
+ >=dev-libs/openssl-1.0.1h:0=[static-libs?]
+ )
+ gnutls? (
+ app-crypt/trousers
+ app-misc/ca-certificates
+ dev-libs/nettle
+ >=net-libs/gnutls-3:0=[static-libs?]
+ )
+ gssapi? ( virtual/krb5 )
+ libproxy? ( net-libs/libproxy )
+ lz4? ( app-arch/lz4:= )
+ nls? ( virtual/libintl )
+ smartcard? ( sys-apps/pcsc-lite:0= )
+ stoken? ( app-crypt/stoken )
+"
+RDEPEND="${DEPEND}
+ sys-apps/iproute2
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( ${PYTHON_DEPS} sys-apps/groff )
+ nls? ( sys-devel/gettext )
+ test? (
+ net-libs/socket_wrapper
+ net-vpn/ocserv
+ sys-libs/uid_wrapper
+ )
+"
+
+CONFIG_CHECK="~TUN"
+
+pkg_pretend() {
+ check_extra_config
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == ]]; then
+ git-r3_src_unpack
+ fi
+ default
+}
+
+src_prepare() {
+ default
+ if [[ ${PV} == ]]; then
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ if use doc; then
+ python_setup
+ else
+ export ac_cv_path_PYTHON=
+ fi
+
+ # Used by tests if userpriv is disabled
+ addwrite /run/netns
+
+ local myconf=(
+ --disable-dsa-tests
+ $(use_enable nls)
+ $(use_enable static-libs static)
+ $(use_with !gnutls openssl)
+ $(use_with gnutls)
+ $(use_with libproxy)
+ $(use_with lz4)
+ $(use_with gssapi)
+ $(use_with smartcard libpcsclite)
+ $(use_with stoken)
+ --with-vpnc-script="${EPREFIX}/etc/openconnect/openconnect.sh"
+
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-unstable/
commit: 74359ce3142ea86ec9ecfb159663430e36d78f5e Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 30 18:43:30 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 1 04:27:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74359ce3 www-client/google-chrome-unstable: automated update (84.0.4128.3) Package-Manager: Portage-2.3.99_p2, Repoman-2.3.22_p31 Signed-off-by: Mike Gilbert gentoo.org> www-client/google-chrome-unstable/Manifest | 2 +- ...ble-84.0.4122.7.ebuild => google-chrome-unstable-84.0.4128.3.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 5fb16014f30..0055275e7a5 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1 +1 @@ -DIST google-chrome-unstable_84.0.4122.7-1_amd64.deb 69126662 BLAKE2B 46378000f3d7bd985eb5a827841b9ee27a452b1f998d9f17abe36e9a24dfb508a436def648959037957f0127ed06389cd59d577ce94be3d073d44c4680bf22ec SHA512 5098ce0f6f5c605fde11744162343123bb065028b355b50929d127655eff0f0ea022c68c9b9041d36020eba1fa5e5fd538e9a9cc6eb9fca9c98783089c761245 +DIST google-chrome-unstable_84.0.4128.3-1_amd64.deb 69606370 BLAKE2B c3e6aca4b0b2c2349ab8ed7e57a2a6b2ae3f639d2e1f5f414fa4d15bef90ea03f953ac7e92e3f84afabc805002b296d694383e83e8005762677a502d4bc15bb0 SHA512 5764e16ec8782290447c8be2950250d4dcfb4b039a32bf2f082a2b21d080492ec518322d71894918f6e6f3e6cfcfb329564af3a9f4e2a977521b88ca8c479f38 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-84.0.4122.7.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-84.0.4128.3.ebuild similarity index 100% rename from www-client/google-chrome-unstable/google-chrome-unstable-84.0.4122.7.ebuild rename to www-client/google-chrome-unstable/google-chrome-unstable-84.0.4128.3.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-plugins/chrome-binary-plugins/
commit: 774dc5feda3161e4d9f607013967446360df389c Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 30 18:43:39 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 1 04:27:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774dc5fe www-plugins/chrome-binary-plugins: automated update Package-Manager: Portage-2.3.99_p2, Repoman-2.3.22_p31 Signed-off-by: Mike Gilbert gentoo.org> www-plugins/chrome-binary-plugins/Manifest| 4 ++-- 23_beta.ebuild => chrome-binary-plugins-83.0.4103.34_beta.ebuild} | 0 7_alpha.ebuild => chrome-binary-plugins-84.0.4128.3_alpha.ebuild} | 0 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index ba7d7dfc0bf..8b890fbc3a5 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ -DIST google-chrome-beta_83.0.4103.23-1_amd64.deb 68347766 BLAKE2B 325c051da780ab5222462af4d39d977a1d0f010ac4b3e2b5a40329542df9d31f812698867a907b096be3f70df5952a9ea0266d8a9b9d2547b216dd84315bc6d3 SHA512 9a979c2731f9efa4f0e86137414d709db4cd4f23fc97ffedbbd61511197f64eeedcaa7929238d8f815caaff9abf7f578c4d2b7a57243a2fd4f2c1a0273d3ff42 +DIST google-chrome-beta_83.0.4103.34-1_amd64.deb 68651028 BLAKE2B bade9093ef0494a3441ebfac7d53ba49ff96df419361f28a88b4ee182acfcb8227ba8b76a82b5f977150273ca0038b9ffb3c7aea38bb4f12b118ebb2baf3d30b SHA512 a8611ed9a483a5d4f69cb530c768683145fa99aceab44d234450e9c4165194b7e4919fbad3ae7fc1b3c47b173f4b4e18ca07b805a0d356ea4f8b32123838c1a1 DIST google-chrome-stable_81.0.4044.129-1_amd64.deb 67137920 BLAKE2B 059fa43c5b5f0eff3eb92dc7ea9692ba4f33eaa928399e2330c8c23ffee8b595ca61a85aff7b81cfbec0ccb49e7f168a5fcd26cf954072c25533ad053b330e3e SHA512 9a6766f4e8f6f326cb41ba945bbccdc9beed25cee51f62fc8c82f2b5021c078bd6ef4e9e2491a34714ada17bf57c9884e010b6cef76a5b0186e8ee5b571925e9 -DIST google-chrome-unstable_84.0.4122.7-1_amd64.deb 69126662 BLAKE2B 46378000f3d7bd985eb5a827841b9ee27a452b1f998d9f17abe36e9a24dfb508a436def648959037957f0127ed06389cd59d577ce94be3d073d44c4680bf22ec SHA512 5098ce0f6f5c605fde11744162343123bb065028b355b50929d127655eff0f0ea022c68c9b9041d36020eba1fa5e5fd538e9a9cc6eb9fca9c98783089c761245 +DIST google-chrome-unstable_84.0.4128.3-1_amd64.deb 69606370 BLAKE2B c3e6aca4b0b2c2349ab8ed7e57a2a6b2ae3f639d2e1f5f414fa4d15bef90ea03f953ac7e92e3f84afabc805002b296d694383e83e8005762677a502d4bc15bb0 SHA512 5764e16ec8782290447c8be2950250d4dcfb4b039a32bf2f082a2b21d080492ec518322d71894918f6e6f3e6cfcfb329564af3a9f4e2a977521b88ca8c479f38 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.23_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.34_beta.ebuild similarity index 100% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.23_beta.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-83.0.4103.34_beta.ebuild diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4122.7_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4128.3_alpha.ebuild similarity index 100% rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4122.7_alpha.ebuild rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4128.3_alpha.ebuild
[gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/
commit: 5b4ea00fe5f6bbb1beb42043da727131510094e3 Author: Mike Gilbert gentoo org> AuthorDate: Thu Apr 30 18:42:46 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Fri May 1 04:27:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4ea00f www-client/google-chrome-beta: automated update (83.0.4103.34) Package-Manager: Portage-2.3.99_p2, Repoman-2.3.22_p31 Signed-off-by: Mike Gilbert gentoo.org> www-client/google-chrome-beta/Manifest | 2 +- ...-beta-83.0.4103.23.ebuild => google-chrome-beta-83.0.4103.34.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index 6624777812f..43a7c14aa0c 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1 +1 @@ -DIST google-chrome-beta_83.0.4103.23-1_amd64.deb 68347766 BLAKE2B 325c051da780ab5222462af4d39d977a1d0f010ac4b3e2b5a40329542df9d31f812698867a907b096be3f70df5952a9ea0266d8a9b9d2547b216dd84315bc6d3 SHA512 9a979c2731f9efa4f0e86137414d709db4cd4f23fc97ffedbbd61511197f64eeedcaa7929238d8f815caaff9abf7f578c4d2b7a57243a2fd4f2c1a0273d3ff42 +DIST google-chrome-beta_83.0.4103.34-1_amd64.deb 68651028 BLAKE2B bade9093ef0494a3441ebfac7d53ba49ff96df419361f28a88b4ee182acfcb8227ba8b76a82b5f977150273ca0038b9ffb3c7aea38bb4f12b118ebb2baf3d30b SHA512 a8611ed9a483a5d4f69cb530c768683145fa99aceab44d234450e9c4165194b7e4919fbad3ae7fc1b3c47b173f4b4e18ca07b805a0d356ea4f8b32123838c1a1 diff --git a/www-client/google-chrome-beta/google-chrome-beta-83.0.4103.23.ebuild b/www-client/google-chrome-beta/google-chrome-beta-83.0.4103.34.ebuild similarity index 100% rename from www-client/google-chrome-beta/google-chrome-beta-83.0.4103.23.ebuild rename to www-client/google-chrome-beta/google-chrome-beta-83.0.4103.34.ebuild
[gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/
commit: b622e2f86a2be4087fd4c6b6444380715ca4375b
Author: Jeroen Roovers gentoo org>
AuthorDate: Thu Apr 30 20:03:48 2020 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri May 1 04:08:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b622e2f8
x11-drivers/nvidia-drivers: Install /lib/systemd/system-sleep/nvidia
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Bug: https://bugs.gentoo.org/689588
Signed-off-by: Jeroen Roovers gentoo.org>
...{nvidia-drivers-430.64-r3.ebuild => nvidia-drivers-430.64-r4.ebuild} | 2 ++
...{nvidia-drivers-435.21-r3.ebuild => nvidia-drivers-435.21-r4.ebuild} | 2 ++
...{nvidia-drivers-440.82-r2.ebuild => nvidia-drivers-440.82-r3.ebuild} | 2 ++
3 files changed, 6 insertions(+)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r3.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r3.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
index 1be19616885..b2ececcd9f2 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r4.ebuild
@@ -384,6 +384,8 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
+ exeinto $(systemd_get_utildir)/system-sleep
+ doexe nvidia
if has_multilib_profile && use multilib; then
local OABI=${ABI}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r3.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r3.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
index 6f6ad537deb..c296f60063b 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r3.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r4.ebuild
@@ -388,6 +388,8 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
+ exeinto $(systemd_get_utildir)/system-sleep
+ doexe nvidia
if has_multilib_profile && use multilib; then
local OABI=${ABI}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r2.ebuild
b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
index f1290ed207f..eb5939644e0 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.82-r3.ebuild
@@ -394,6 +394,8 @@ src_install() {
systemd_dounit *.service
dobin nvidia-sleep.sh
+ exeinto $(systemd_get_utildir)/system-sleep
+ doexe nvidia
if has_multilib_profile && use multilib; then
local OABI=${ABI}
[gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/usockets/
commit: 5983fae516ae88018064caf4bd30f774deb6d634 Author: Aisha Tammy aisha cc> AuthorDate: Thu Apr 30 23:28:00 2020 + Commit: Aisha Tammy aisha cc> CommitDate: Thu Apr 30 23:28:00 2020 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5983fae5 dev-cpp/usockets: ssl -> openssl use flag changed Signed-off-by: Aisha Tammy aisha.cc> dev-cpp/usockets/usockets-0.3.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-cpp/usockets/usockets-0.3.5.ebuild b/dev-cpp/usockets/usockets-0.3.5.ebuild index 3e25b08..a77e1a0 100644 --- a/dev-cpp/usockets/usockets-0.3.5.ebuild +++ b/dev-cpp/usockets/usockets-0.3.5.ebuild @@ -19,9 +19,9 @@ fi LICENSE="Apache-2.0" SLOT="0" -IUSE="libuv +ssl libressl debug" +IUSE="libuv +openssl libressl debug" -DEPEND="ssl? ( +DEPEND="openssl? ( libressl? ( >=dev-libs/libressl-3.0.0 ) !libressl? ( >=dev-libs/openssl-1.1.0 ) )
[gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/usockets/, dev-cpp/uwebsockets/, net-misc/purritobin/
commit: 8013839bb6df5b4f5a6b6051fd7c0d7db7ed6d16
Author: Aisha Tammy aisha cc>
AuthorDate: Thu Apr 30 23:22:29 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Thu Apr 30 23:22:29 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8013839b
dev-cpp/{usockets, uwebsockets} net-misc/purritobin
Fixes mentioned by @Alessandro-Barbier
Signed-off-by: Aisha Tammy aisha.cc>
dev-cpp/usockets/metadata.xml | 4
dev-cpp/usockets/usockets-0.3.5.ebuild | 9 +
dev-cpp/uwebsockets/metadata.xml| 4
net-misc/purritobin/metadata.xml| 4
net-misc/purritobin/purritobin-0.1.3.ebuild | 1 -
net-misc/purritobin/purritobin-.ebuild | 1 -
6 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/dev-cpp/usockets/metadata.xml b/dev-cpp/usockets/metadata.xml
index 941cb6b..73dd576 100644
--- a/dev-cpp/usockets/metadata.xml
+++ b/dev-cpp/usockets/metadata.xml
@@ -5,10 +5,6 @@
gen...@aisha.cc
Aisha Tammy
-
-proxy-ma...@gentoo.org
-Proxy Maintainers
-
Enable bindings to use the libuv dispatcher
diff --git a/dev-cpp/usockets/usockets-0.3.5.ebuild
b/dev-cpp/usockets/usockets-0.3.5.ebuild
index d971bed..3e25b08 100644
--- a/dev-cpp/usockets/usockets-0.3.5.ebuild
+++ b/dev-cpp/usockets/usockets-0.3.5.ebuild
@@ -26,6 +26,15 @@ DEPEND="ssl? (
!libressl? ( >=dev-libs/openssl-1.1.0 )
)
libuv? ( dev-libs/libuv )
+ debug? (
+ || (
+ >=sys-devel/gcc-7.4.0[sanitize]
+ (
+ sys-devel/clang-runtime[sanitize]
+ sys-libs/compiler-rt-sanitizers[sanitize]
+ )
+ )
+ )
"
BDEPEND="${DEPEND}"
RDEPEND="${DEPEND}"
diff --git a/dev-cpp/uwebsockets/metadata.xml b/dev-cpp/uwebsockets/metadata.xml
index cfbacce..a3865a3 100644
--- a/dev-cpp/uwebsockets/metadata.xml
+++ b/dev-cpp/uwebsockets/metadata.xml
@@ -5,8 +5,4 @@
gen...@aisha.cc
Aisha Tammy
-
-proxy-ma...@gentoo.org
-Proxy Maintainers
-
diff --git a/net-misc/purritobin/metadata.xml b/net-misc/purritobin/metadata.xml
index ea7ac63..8f8970a 100644
--- a/net-misc/purritobin/metadata.xml
+++ b/net-misc/purritobin/metadata.xml
@@ -5,10 +5,6 @@
gen...@aisha.cc
Aisha Tammy
-
- proxy-ma...@gentoo.org
- Proxy Maintainers
-
use libuv to do async operations, instead of
linux kernels epoll
diff --git a/net-misc/purritobin/purritobin-0.1.3.ebuild
b/net-misc/purritobin/purritobin-0.1.3.ebuild
index ed23716..210bf60 100644
--- a/net-misc/purritobin/purritobin-0.1.3.ebuild
+++ b/net-misc/purritobin/purritobin-0.1.3.ebuild
@@ -25,7 +25,6 @@ DEPEND=">=dev-cpp/usockets-0.3.5:=[libuv?]
libuv? ( >=dev-libs/libuv-1.35.0 )
"
RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
src_compile() {
if use libuv; then
diff --git a/net-misc/purritobin/purritobin-.ebuild
b/net-misc/purritobin/purritobin-.ebuild
index ed23716..210bf60 100644
--- a/net-misc/purritobin/purritobin-.ebuild
+++ b/net-misc/purritobin/purritobin-.ebuild
@@ -25,7 +25,6 @@ DEPEND=">=dev-cpp/usockets-0.3.5:=[libuv?]
libuv? ( >=dev-libs/libuv-1.35.0 )
"
RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
src_compile() {
if use libuv; then
[gentoo-commits] repo/gentoo:master commit in: www-apps/wordpress/
commit: 6f24a81cb520d980ba42f0a637585caeb72312eb
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri May 1 03:19:00 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri May 1 03:19:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f24a81c
www-apps/wordpress: removed vulnerable 5.4
Bug: https://bugs.gentoo.org/720220
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Miroslav Šulc gentoo.org>
www-apps/wordpress/Manifest | 1 -
www-apps/wordpress/wordpress-5.4.ebuild | 57 -
2 files changed, 58 deletions(-)
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index f279a7f954c..38955bf108c 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,2 +1 @@
DIST wordpress-5.4.1.tar.gz 12234700 BLAKE2B
0df1f1b1da22c5ad429ef59861dbcb80b5bd6c8720bc96b450d2b6599b903dda813e16f28fc2ee2afe1654b4047556a06bb409f6d0a3be3671b37e54fac52cf3
SHA512
5ed4f3bd593febdf2aec4c582c2ed850d3bf52122273b4306c1fba87939a675228df84092a709052f13e0096b2545cd6f078ab89b232ee4b4dce467d834de0cd
-DIST wordpress-5.4.tar.gz 12230487 BLAKE2B
bced3e3eec1179b4c52190b24626632b3d0899f3dc33112374f316421ec6287b58d6c8684c85e743f5c92c2278e3e1408091dede6bacbc9b9be093350ed061c8
SHA512
0d2ae85bd0d0d1aeda6bc371d6357660233b604e46d764f2955abc88ccecd8bfb76f9b8d7fac788a3f8d9abb2a10b8ae60cee74ddcbe483136f0fd7ba0b842d8
diff --git a/www-apps/wordpress/wordpress-5.4.ebuild
b/www-apps/wordpress/wordpress-5.4.ebuild
deleted file mode 100644
index 6fc0786bf3b..000
--- a/www-apps/wordpress/wordpress-5.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit webapp
-
-DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
-HOMEPAGE="https://wordpress.org/;
-SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz;
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="virtual/httpd-php
- || ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
-
-S=${WORKDIR}/${PN}
-
-need_httpd_cgi
-
-IUSE="+akismet examples +themes vhosts"
-
-src_install() {
- webapp_src_preinst
-
- dodoc readme.html
- rm readme.html license.txt || die
-
- if use !akismet ; then
- rm -R wp-content/plugins/akismet/ || die
- fi
- if use !examples ; then
- rm wp-content/plugins/hello.php || die
- fi
- if use !themes ; then
- rm -R wp-content/themes/*/ || die
- fi
-
- [[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- webapp_serverowned "${MY_HTDOCSDIR}"/index.php
- webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
- webapp_serverowned "${MY_HTDOCSDIR}"
- # allows plugins update if allowed within WP
- webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/includes/file.php
-
- webapp_configfile "${MY_HTDOCSDIR}"/wp-config.php
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
- webapp_src_install
-}
[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/files/, app-admin/salt/
commit: 680afc54c6185bec1af67dbacaab9df9e247756a
Author: Patrick McLean sony com>
AuthorDate: Fri May 1 00:50:56 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Fri May 1 01:07:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680afc54
app-admin/salt-3000.2-r4: revbump, fix warnings with py38
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
app-admin/salt/Manifest| 1 +
.../salt/files/salt-3000.2-py38-logwarn.patch | 116 ++
app-admin/salt/files/salt-3000.2-py38-misc.patch | 460 -
.../salt/files/salt-3000.2-tornado-py38.patch | 12 -
...salt-3000.2-r3.ebuild => salt-3000.2-r4.ebuild} | 15 +-
5 files changed, 128 insertions(+), 476 deletions(-)
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 64303c5476b..fed8fc97b0c 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,2 +1,3 @@
DIST salt-2019.2.4.tar.gz 14572556 BLAKE2B
a1057baa5ab6c0a07f34ce658a1d5bc644f968600663d28d084eb712b55faaee93b8410d81c4b5324944e6e1f2067ffb102200088832e1b0076fed78c8542ae6
SHA512
9e621cbd78ead1060a2b0c07e7ef02e8c4590360a95c51ac29fa8c1add34f617e4407dd28b67cae3b0fd68b333782185edcf1159edd2db08e8b4e79b6b07a63f
+DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B
68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec
SHA512
6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
DIST salt-3000.2.tar.gz 15231513 BLAKE2B
2090d0f52f953a42f1685ad190750e9c76ad6e862a3272444fef063a7605f69a6c542f04165a41fb9cdaa126a878cc133d4857faa70edc5eac4bf49bdde937ab
SHA512
88e8876ed8cd18e942c2194686cda68f40fa49e69e317ca488bf58e095bcf6cdf8771d93eba7960038941cc5863e13a4eea4dad5256c12da7cd8288a2c61f59d
diff --git a/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
b/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
new file mode 100644
index 000..e77d2376ce1
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
@@ -0,0 +1,116 @@
+diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
+index 68f752cb2d..fa2b96499d 100644
+--- a/salt/cloud/clouds/ec2.py
b/salt/cloud/clouds/ec2.py
+@@ -4901,7 +4901,7 @@ def get_password_data(
+
+ if not HAS_M2 and not HAS_PYCRYPTO:
+ if 'key' in kwargs or 'key_file' in kwargs:
+-log.warn("No crypto library is installed, can not decrypt
password")
++log.warning("No crypto library is installed, can not decrypt
password")
+ return ret
+
+ if 'key' not in kwargs:
+diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py
+index 9dd1007c1b..47c82a7141 100644
+--- a/salt/modules/gpg.py
b/salt/modules/gpg.py
+@@ -1083,7 +1083,7 @@ def verify(text=None,
+
+ if trustmodel and trustmodel not in trustmodels:
+ msg = 'Invalid trustmodel defined: {}. Use one of:
{}'.format(trustmodel, ', '.join(trustmodels))
+-log.warn(msg)
++log.warning(msg)
+ return {'res': False, 'message': msg}
+
+ extra_args = []
+diff --git a/salt/modules/network.py b/salt/modules/network.py
+index 38e2bc326e..f3a8a714cd 100644
+--- a/salt/modules/network.py
b/salt/modules/network.py
+@@ -958,7 +958,7 @@ def traceroute(host):
+
+ ret.append(result)
+ if not result:
+-log.warn('Cannot parse traceroute output line: %s', line)
++log.warning('Cannot parse traceroute output line: %s', line)
+ return ret
+
+
+diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py
+index 138a0fcf51..5f026b0f36 100644
+--- a/salt/modules/saltutil.py
b/salt/modules/saltutil.py
+@@ -1096,7 +1096,7 @@ def refresh_pillar(wait=False, timeout=30):
+ tag='/salt/minion/minion_pillar_refresh_complete',
+ wait=timeout)
+ if not event_ret or event_ret['complete'] is False:
+-log.warn("Pillar refresh did not complete within timeout %s",
timeout)
++log.warning("Pillar refresh did not complete within timeout %s",
timeout)
+ return ret
+
+
+diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
+index 12ef24e86f..e83d1c927f 100644
+--- a/salt/transport/tcp.py
b/salt/transport/tcp.py
+@@ -1073,7 +1073,7 @@ class SaltMessageClient(object):
+ self._connecting_future.set_result(True)
+ break
+ except Exception as exc: # pylint: disable=broad-except
+-log.warn('TCP Message Client encountered an exception %r',
exc)
++log.warning('TCP Message Client encountered an exception %r',
exc)
+ yield salt.ext.tornado.gen.sleep(1) # TODO: backoff
+ #self._connecting_future.set_exception(e)
+
+diff --git a/salt/utils/process.py
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 570aee4e7db0a9182bdca1e5cced4af0b5579e9c
Author: Alexander Tsoy tsoy me>
AuthorDate: Sat Mar 14 07:33:45 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Apr 30 23:55:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570aee4e
media-sound/audacity: Fix building with -fno-common
Closes: https://bugs.gentoo.org/709840
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14949
Signed-off-by: Lars Wendler gentoo.org>
media-sound/audacity/audacity-2.3.3.ebuild | 1 +
.../audacity/files/audacity-2.3.3-fno-common.patch | 62 ++
2 files changed, 63 insertions(+)
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild
b/media-sound/audacity/audacity-2.3.3.ebuild
index d72fafa615e..0418e4cc865 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -55,6 +55,7 @@ BDEPEND="app-arch/unzip
PATCHES=(
"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+ "${FILESDIR}"/${PN}-2.3.3-fno-common.patch
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
new file mode 100644
index 000..5b922638aa5
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
@@ -0,0 +1,62 @@
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
+From: Leland Lucius
+Date: Mon, 16 Dec 2019 00:59:33 -0600
+Subject: [PATCH] Misc changes to get new Nyquist to build
+
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
+---
+ lib-src/libnyquist/nyquist/cmt/cmtio.h | 4 ++--
+ lib-src/libnyquist/nyquist/cmt/userio.c | 4
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h
b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+index 3e50ad957..232862b50 100644
+--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h
b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+@@ -1,7 +1,7 @@
+ #define NOCHAR -2
+
+-int IOinputfd;
+-int IOnochar;
++extern int IOinputfd;
++extern int IOnochar;
+
+ int IOsetup(int inputfd);
+ int IOcleanup(void);
+diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c
b/lib-src/libnyquist/nyquist/cmt/userio.c
+index f442376c5..a33ac98c9 100644
+--- a/lib-src/libnyquist/nyquist/cmt/userio.c
b/lib-src/libnyquist/nyquist/cmt/userio.c
+@@ -153,6 +153,10 @@ extern int debug;
+ #include "xlisp.h"
+ #endif
+
++int IOinputfd; /* input file descriptor (usually 0) */
++
++int IOnochar; /* Value to be returned by IOgetchar()
++ where there is no input to be had */
+
+ /
+ *
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c
b/lib-src/libnyquist/nyquist/sys/unix/io.c
+index 21b2abed8..f3e499c0d 100644
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c
b/lib-src/libnyquist/nyquist/sys/unix/io.c
+@@ -16,10 +16,10 @@
+ #include
+ #include "cext.h"
+
+-int IOinputfd; /* input file descriptor (usually 0) */
++extern int IOinputfd; /* input file descriptor (usually 0) */
+
+-int IOnochar; /* Value to be returned by IOgetchar()
+- where there is no input to be had */
++extern int IOnochar; /* Value to be returned by IOgetchar()
++ where there is no input to be had */
+
+ static struct sgttyb IOoldmodes, IOcurrentmodes;
+ /* Initial and current tty modes */
+--
+2.24.1
+
[gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/
commit: a1cc6f0bdfeb26400cbfac4fb86031c1bab3b6ef
Author: Sergei Trofimovich gentoo org>
AuthorDate: Thu Apr 30 23:23:54 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Thu Apr 30 23:47:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1cc6f0b
app-emulation/qemu: bump up to 5.0.0, bug #720138
Two new USE flags:
- io-uring for fast async io_uring I/O
- zstd for libzstd compression of migration traffic
Reported-by: Thomas Stein
Closes: https://bugs.gentoo.org/720138
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich gentoo.org>
app-emulation/qemu/Manifest| 1 +
.../qemu/files/qemu-5.0.0-epoll-strace.patch | 50 ++
app-emulation/qemu/metadata.xml| 1 +
.../qemu/{qemu-.ebuild => qemu-5.0.0.ebuild} | 15 +--
app-emulation/qemu/qemu-.ebuild| 15 +--
5 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 7aa3b70b1a9..333933242cf 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1,3 @@
DIST qemu-4.2.0-patches-r2.tar.xz 17868 BLAKE2B
3783d0f923ded66cce1195248981c83bbaf8b7ad2a270207e92e60b4d05d4787cd9324649c113a4616c2a9ddcef99841264f19915615b7a0a24dac9febed48ba
SHA512
556f1c595a35ee4279b2d0890d90e48cd43d9d641ccca495e2494f62ab48dfc000dbe23718276271ced3d4b7680c814f8f8846195089ff56186f618063a83b48
DIST qemu-4.2.0.tar.xz 6068 BLAKE2B
27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef
SHA512
2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
+DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B
785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63
SHA512
21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
diff --git a/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
b/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
new file mode 100644
index 000..c0f9a2e008d
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-5.0.0-epoll-strace.patch
@@ -0,0 +1,50 @@
+https://lists.nongnu.org/archive/html/qemu-devel/2020-04/msg02643.html
+
+From 6bce23d8daf96a7faa9288e7414948cda31ddaa2 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Thu, 16 Apr 2020 18:55:49 +0100
+Subject: [PATCH] linux-user/strace.list: fix epoll_create{,1} -strace output
+
+Fix syscall name and parameters priinter.
+
+Before the change:
+
+```
+$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
+...
+1274697
%s(%d)(2097152,274903156744,274903156760,274905840712,274877908880,274903235616)
= 3
+1274697 exit_group(0)
+```
+
+After the change:
+
+```
+$ alpha-linux-user/qemu-alpha -strace -L /usr/alpha-unknown-linux-gnu/ /tmp/a
+...
+1273719 epoll_create1(2097152) = 3
+1273719 exit_group(0)
+```
+
+Signed-off-by: Sergei Trofimovich
+---
+ linux-user/strace.list | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/linux-user/strace.list
b/linux-user/strace.list
+@@ -125,10 +125,10 @@
+ { TARGET_NR_dup3, "dup3" , "%s(%d,%d,%d)", NULL, NULL },
+ #endif
+ #ifdef TARGET_NR_epoll_create
+-{ TARGET_NR_epoll_create, "%s(%d)", NULL, NULL, NULL },
++{ TARGET_NR_epoll_create, "epoll_create", "%s(%d)", NULL, NULL },
+ #endif
+ #ifdef TARGET_NR_epoll_create1
+-{ TARGET_NR_epoll_create1, "%s(%d)", NULL, NULL, NULL },
++{ TARGET_NR_epoll_create1, "epoll_create1", "%s(%d)", NULL, NULL },
+ #endif
+ #ifdef TARGET_NR_epoll_ctl
+ { TARGET_NR_epoll_ctl, "epoll_ctl" , NULL, NULL, NULL },
+--
+2.26.2
+
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 07244b5deff..0c30c458264 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -28,6 +28,7 @@
Enable direct iSCSI support via
net-libs/libiscsi instead of indirectly via the Linux
block layer that sys-block/open-iscsi does.
+ Enable efficient I/O via
sys-libs/liburing.
Enable the ncurses-based console
Enable NFS support
Enable NUMA support
diff --git a/app-emulation/qemu/qemu-.ebuild
b/app-emulation/qemu/qemu-5.0.0.ebuild
similarity index 98%
copy from app-emulation/qemu/qemu-.ebuild
copy to app-emulation/qemu/qemu-5.0.0.ebuild
index b189a315909..ae78e0ad179 100644
--- a/app-emulation/qemu/qemu-.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} = ** ]]; then
SRC_URI=""
else
SRC_URI="https://download.qemu.org/${P}.tar.xz;
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~x86"
fi
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo-gog/
commit: 6fdb4adf6d200ec17787798b9e02ccadb684955a
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Apr 30 23:35:23 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Apr 30 23:38:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fdb4adf
games-puzzle/world-of-goo-gog: Fix bad usex usage on x86
Closes: https://bugs.gentoo.org/720186
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
index 186582c1e15..28a6b68bfec 100644
--- a/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
+++ b/games-puzzle/world-of-goo-gog/world-of-goo-gog-1.51.29337.ebuild
@@ -47,12 +47,12 @@ src_unpack() {
src_install() {
exeinto "${dir}"
- newexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64) ${MY_PN}.bin
+ newexe data/noarch/game/${MY_PN}.bin.x86$(usex amd64 _64 "")
${MY_PN}.bin
dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN%-*}
insinto "${dir}"
doins -r data/noarch/game/game/
- use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64)/
+ use bundled-libs && doins -r data/noarch/game/lib$(usex amd64 64 "")/
newicon -s 256 data/noarch/game/game/gooicon.png ${PN%-*}.png
make_desktop_entry ${PN%-*} "World of Goo" ${PN%-*}
[gentoo-commits] repo/gentoo:master commit in: dev-java/gradle-bin/
commit: b0c814e2c0e7b8761f63a974ffda468d6652fa6b
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Apr 30 23:37:02 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Apr 30 23:38:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c814e2
dev-java/gradle-bin: Bump to version 6.3 and EAPI 7
Examples are no longer included but there is more documentation.
Closes: https://bugs.gentoo.org/633546
Bug: https://bugs.gentoo.org/683032
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
dev-java/gradle-bin/Manifest | 1 +
dev-java/gradle-bin/gradle-bin-6.3.ebuild | 49 +++
2 files changed, 50 insertions(+)
diff --git a/dev-java/gradle-bin/Manifest b/dev-java/gradle-bin/Manifest
index c3636088586..f28afb350fe 100644
--- a/dev-java/gradle-bin/Manifest
+++ b/dev-java/gradle-bin/Manifest
@@ -1,3 +1,4 @@
DIST gradle-3.3-all.zip 91388147 BLAKE2B
15539ec06cadcdaee9d54928381d5626bf06bae3251eb304fee095e6d0362f23759e99e3841dac2b9a1eed50b6057ecce78230dafb45711bfe764bf107b1f704
SHA512
4b852eaf4030c780516fe9214c289e49fc93fc62672da70b7fd6bbbcd128e6912dd196195ce32570984503ea53b48593a41fbf4ec69b0f18b5e32c2fe9e556b3
DIST gradle-3.4.1-all.zip 91604607 BLAKE2B
1c4aaae4899f3faa94fc3ead84c4fd4bdb6212c0f579a255c7494896fd2a498890c58e853315892c3c9d78635b58da5423b1b2211b991639474d19eca1f2992f
SHA512
bdaabf747e60ae1cf2c9fedb0730a2e3deb914609db05ffc7e4cbd5402bc44e84d2c98154f14fdd7f944c2f49eb5dead0f44c119ac5a16bd7491c3369d784f5c
DIST gradle-bin-5.2.1.zip 132549774 BLAKE2B
c6d6fa9975bc28030672a99f22f0e9c4c2cb3d667ae3658c1062428d0ab2fd8c3b4df0479f4fde7b2d75b8fcb64c7f5b208e53c5b30a9b3c7afb5ad7e1a4139d
SHA512
e2a17072c10d27acbe4a0282dfdfed907ab5c57109668595feaec681ab1d4be017ac0f6090c2c2b64a057d71c1e244bb50f4047509d36c5930e894837a96171b
+DIST gradle-bin-6.3.zip 145161013 BLAKE2B
f840bda2c1e2a6dd5306b9f7ad6fc8ae8c3d7342de57bd813b8dff64f733fc058af8dc7c9c5a138eac4eef3d5d12074976db81fe7eeb51b52d726502af04d036
SHA512
9796c14f8d4559128b4cb7e676883d83ef99b67242ae8156abebdb38bb7a561e8b3df3f93b24aa53274b7d78a7b04ea51e73268c2465799daa9da53ef73de24d
diff --git a/dev-java/gradle-bin/gradle-bin-6.3.ebuild
b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
new file mode 100644
index 000..93eb5b8f352
--- /dev/null
+++ b/dev-java/gradle-bin/gradle-bin-6.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+IUSE="doc"
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2
+
+MY_PN=${PN%%-bin}
+MY_P="${MY_PN}-${PV/_rc/-rc-}"
+
+DESCRIPTION="A project automation and build tool with a Groovy based DSL"
+SRC_URI="https://services.gradle.org/distributions/${MY_P}-all.zip -> ${P}.zip"
+HOMEPAGE="https://www.gradle.org/;
+
+LICENSE="Apache-2.0"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+DEPEND=">=virtual/jre-1.8"
+RDEPEND=">=virtual/jdk-1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ local gradle_dir="${EPREFIX}/usr/share/${PN}-${SLOT}"
+
+ insinto "${gradle_dir}"
+ doins -r lib/
+
+ exeinto "${gradle_dir}"/bin
+ doexe bin/${MY_PN}
+ dosym "../${gradle_dir##*/usr/}/bin/gradle" "/usr/bin/${MY_PN}-${SLOT}"
+
+ docinto html
+ dodoc -r docs/release-notes.html
+
+ if use doc ; then
+ dodoc -r docs/{dsl,userguide}
+ java-pkg_dojavadoc docs/javadoc
+ fi
+
+ if use source ; then
+ java-pkg_dosrc src/*
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: games-puzzle/world-of-goo-hb/
commit: dd36e593f95ebd05e799810514fe720f5d43b86b
Author: James Le Cuirot gentoo org>
AuthorDate: Thu Apr 30 23:34:58 2020 +
Commit: James Le Cuirot gentoo org>
CommitDate: Thu Apr 30 23:38:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd36e593
games-puzzle/world-of-goo-hb: Fix bad usex usage on x86
Closes: https://bugs.gentoo.org/720186
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot gentoo.org>
games-puzzle/world-of-goo-hb/world-of-goo-hb-1.53.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-puzzle/world-of-goo-hb/world-of-goo-hb-1.53.ebuild
b/games-puzzle/world-of-goo-hb/world-of-goo-hb-1.53.ebuild
index f08ef5823bf..01269cea575 100644
--- a/games-puzzle/world-of-goo-hb/world-of-goo-hb-1.53.ebuild
+++ b/games-puzzle/world-of-goo-hb/world-of-goo-hb-1.53.ebuild
@@ -51,12 +51,12 @@ src_unpack() {
src_install() {
exeinto "${dir}"
- newexe data/x86$(usex amd64 _64)/${MY_PN}.bin.x86$(usex amd64 _64)
${MY_PN}.bin
+ newexe data/x86$(usex amd64 _64 "")/${MY_PN}.bin.x86$(usex amd64 _64
"") ${MY_PN}.bin
dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN%-*}
insinto "${dir}"
doins -r data/noarch/game/
- use bundled-libs && doins -r data/x86$(usex amd64 _64)/lib$(usex amd64
64)/
+ use bundled-libs && doins -r data/x86$(usex amd64 _64 "")/lib$(usex
amd64 64 "")/
newicon -s 256 data/noarch/game/gooicon.png ${PN%-*}.png
make_desktop_entry ${PN%-*} "World of Goo" ${PN%-*}
[gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/, dev-libs/librdkafka/files/
commit: d43aca579cd3e0fa62569c2030f82db85c9bcb8e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 23:36:00 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 23:36:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43aca57
dev-libs/librdkafka: security cleanup
Bug: https://bugs.gentoo.org/717704
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-libs/librdkafka/Manifest | 4 --
...librdkafka-1.1.0-remove-automagic-on-zstd.patch | 29
dev-libs/librdkafka/librdkafka-1.1.0.ebuild| 78 --
dev-libs/librdkafka/librdkafka-1.2.1.ebuild| 76 -
dev-libs/librdkafka/librdkafka-1.2.2.ebuild| 76 -
dev-libs/librdkafka/librdkafka-1.3.0.ebuild| 76 -
6 files changed, 339 deletions(-)
diff --git a/dev-libs/librdkafka/Manifest b/dev-libs/librdkafka/Manifest
index 5dcba1b774b..4e8068c2eb4 100644
--- a/dev-libs/librdkafka/Manifest
+++ b/dev-libs/librdkafka/Manifest
@@ -1,5 +1 @@
-DIST librdkafka-1.1.0.tar.gz 2511445 BLAKE2B
00c20361058d537d045da6961afc45e40e0ac641918df9eb457937dc3ca566639b81d8aa10cc6ed2f57988eded180f3d2eaea72ca4b910a652b93b54b9388253
SHA512
35561399b07278a09a51245c5503c86eb0cc8971692b4e65a332144bfb71e2e86d4ceaf1804534b6a416bcace74cef493b6465c20b32c14de97f45f2854359c6
-DIST librdkafka-1.2.1.tar.gz 2547009 BLAKE2B
f55c2f23339294d54c1a3cbe064b0ddb6a638adfd192351a69bba91c81f7d33dfad13b45d50a8ea008e397400c89e90fe267549566a8dff07ca701ae59934126
SHA512
57341a0e4dbe98b9da912f5a63cc82490222bd91aef7c3cda3acaa4807e1d13ac047fbff8898f7459e7a1cb46f02dfc665e8c5bddffd8153d67a2c0546000a62
-DIST librdkafka-1.2.2.tar.gz 2588441 BLAKE2B
27cf73c61a56cd899926a2022f3751f66a2569d3065d5c3d8d542df8c0c92db08095188a08c91e347d2c1439f244d417eacbfb218e49c08fe4b5b2ef76f2bd6d
SHA512
ef6fc34989e5e484cb0b9f6a6f8a5c4816d89239c18d65becc2004cdfeedbfb541e18affbb8662b05831003249630cb2119ee496b5b844c963b01eb6d4ebac5a
-DIST librdkafka-1.3.0.tar.gz 2627028 BLAKE2B
bee04707047142833c6c27ec25b81678be929ec08995c0cbf79a744b9c211691a2b4dd086782900a4cead73c6885886a26ab4052a7b9d0f6e6057bbee5a11c1d
SHA512
94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669
DIST librdkafka-1.4.0.tar.gz 2722992 BLAKE2B
590fa90805bc2dc728dd32be333eaf9b2a4e6a840403838406684794ca68f2bcf9fc831e252a637622f9e6cd209d779ed20d503e49dac20bdb28f5d3fbd676bd
SHA512
cd343597707d22490dfcd513a6b24ca5487dca5230a5a6775e7d6f10be2dc5481deb3a76968bb244d5f7514db92aceca541823c5841a7b54d8e00aeb9088731c
diff --git
a/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
b/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
deleted file mode 100644
index 792bb453570..000
--- a/dev-libs/librdkafka/files/librdkafka-1.1.0-remove-automagic-on-zstd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 828e10cb9331fc5bd48fb1d6fdb8e08cd5fb27ea
-Author: Thomas Deutschmann
-AuthorDate: Mon Apr 29 18:57:10 2019 +0200
-Commit: Thomas Deutschmann
-CommitDate: Mon Jun 24 23:52:25 2019 +0200
-
-configure: Add option to disable automagic dependency on zstd
-
-This commit will add an option which will allow you to explicit disable
-zstd usage.
-
-diff --git a/mklove/modules/configure.libzstd
b/mklove/modules/configure.libzstd
-index d9599d82..cb82c128 100644
a/mklove/modules/configure.libzstd
-+++ b/mklove/modules/configure.libzstd
-@@ -9,8 +9,12 @@
- # mkl_check libzstd []
- #
-
-+mkl_toggle_option "Feature" ENABLE_ZSTD "--enable-zstd" "Enable support for
ZSTD compression" "y"
-+
- function manual_checks {
--local action=$1
-+local action=${1:-disable}
-+
-+[[ $ENABLE_ZSTD == y ]] || return 0
-
- mkl_meta_set "libzstd" "brew" "zstd"
- mkl_meta_set "libzstd" "apk" "zstd-dev zstd-static"
diff --git a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
b/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
deleted file mode 100644
index b3f9787c020..000
--- a/dev-libs/librdkafka/librdkafka-1.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Apache Kafka C/C++ client library"
-HOMEPAGE="https://github.com/edenhill/librdkafka;
-
-if [[ ${PV} == "" ]]; then
- EGIT_REPO_URI="https://github.com/edenhill/${PN}.git;
-
- inherit git-r3
-else
- SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 arm arm64 hppa ~ppc ~sparc x86"
-fi
-
-LICENSE="BSD-2"
-
-# subslot = soname version
-SLOT="0/1"
-
-IUSE="lz4 sasl ssl static-libs zstd"
-
-LIB_DEPEND="
- lz4? ( app-arch/lz4:=[static-libs(+)] )
- sasl? ( dev-libs/cyrus-sasl:=[static-libs(+)] )
-
[gentoo-commits] repo/gentoo:master commit in: x11-terms/terminator/, x11-terms/terminator/files/
commit: 53f47bd928f3b470b69a3bfbf44d318dec4e1a6a
Author: Alexey Sokolov google com>
AuthorDate: Tue Mar 3 01:08:52 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Apr 30 23:18:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f47bd9
x11-terms/terminator: bump version, support py3
Some notes:
* I replaced gnome2 with xdg because gnome2 doesn't work with EAPI 7. I
don't know whether the rest of things gnome2 eclass did is important.
* I put myself to maintainer because Andreas Sturmlechner told me to.
It seems to work, and the test passes.
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Alexey Sokolov google.com>
Closes: https://bugs.gentoo.org/716446
Closes: https://github.com/gentoo/gentoo/pull/14826
Signed-off-by: Patrick McLean gentoo.org>
x11-terms/terminator/Manifest | 1 +
.../files/terminator-1.91-without-icon-cache.patch | 16 ++
x11-terms/terminator/metadata.xml | 10 ++--
x11-terms/terminator/terminator-1.92.ebuild| 58 ++
4 files changed, 82 insertions(+), 3 deletions(-)
diff --git a/x11-terms/terminator/Manifest b/x11-terms/terminator/Manifest
index 28305643e3a..5de1326fab2 100644
--- a/x11-terms/terminator/Manifest
+++ b/x11-terms/terminator/Manifest
@@ -1 +1,2 @@
DIST terminator-1.91.tar.gz 910536 BLAKE2B
887eef489dc3eb73f7ae8f6284104ee5e6a23b33bc8486b203f9b53c7de5a11a43fdc6a344b02f269c0d4ce71cfc82f0c8285440900870870a43cd10d99326b9
SHA512
6feee96cda08f913601d3b01e51632bed87712ddb5ce577df1daa8a5fe4e8dc39075d5e21f87b865d1f007c7e1070ee2c0c814540c9c7786f0f24fbee762a03d
+DIST terminator-1.92.tar.gz 910613 BLAKE2B
d7a665f81011b21da14837492f04204158e95d846aaf876d2393fe4a236113d9718be9b3946f38e1385168bbcec72fd65b895b5f476727c8a67bbc6e51016a63
SHA512
9a63d1993582d94711b7be6cad0ecde3969b3a5d297ab388677b485161fae308a93d559f84bc4cb7ff71c8755cac6c2511b3677a8ab1da3da6427c53c68529f1
diff --git
a/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
new file mode 100644
index 000..c924de3607f
--- /dev/null
+++ b/x11-terms/terminator/files/terminator-1.91-without-icon-cache.patch
@@ -0,0 +1,16 @@
+Without this patch, terminator's build script runs gtk-update-icon-cache which
+causes terminator package to claim /usr/share/icons/hicolor/icon-theme.cache as
+its own. To avoid that, gtk-update-icon-cache is run later, as part of
+xdg_pkg_postinst in the ebuild.
+
+--- a/setup.py 2009-08-12 22:22:53.0 -0400
b/setup.py 2009-08-12 22:22:57.0 -0400
+@@ -25,7 +25,7 @@
+
+ def __init__ (self, *args):
+ self.without_gettext = False
+-self.without_icon_cache = False
++self.without_icon_cache = True
+ Distribution.__init__(self, *args)
+
+
diff --git a/x11-terms/terminator/metadata.xml
b/x11-terms/terminator/metadata.xml
index 44b22d322ad..d11068fa01f 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/metadata.xml
@@ -2,8 +2,12 @@
http://www.gentoo.org/dtd/metadata.dtd;>
- chutz...@gentoo.org
- Patrick McLean
+ alexey+gen...@asokolov.org
+ Alexey Sokolov
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
Much of the behaviour of Terminator is based on GNOME Terminal,
and
@@ -16,6 +20,6 @@
Enables desktop notifications
viadev-python/notify-python
- terminator
+ gnome-terminator/terminator
diff --git a/x11-terms/terminator/terminator-1.92.ebuild
b/x11-terms/terminator/terminator-1.92.ebuild
new file mode 100644
index 000..64edc13227e
--- /dev/null
+++ b/x11-terms/terminator/terminator-1.92.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Multiple GNOME terminals in one window"
+HOMEPAGE="https://github.com/gnome-terminator/terminator;
+SRC_URI="https://github.com/gnome-terminator/terminator/releases/download/v${PV}/${P}.tar.gz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus +libnotify test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ dev-libs/keybinder:3[introspection]
+ dev-python/configobj[${PYTHON_USEDEP}]
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=x11-libs/gtk+-3.16:3
+ x11-libs/vte:2.91[introspection]
+ dbus? ( sys-apps/dbus )
+ libnotify? ( x11-libs/libnotify[introspection] )
+"
+BDEPEND="
+ dev-util/intltool
+ test? ( ${RDEPEND} )
+"
+
+PATCHES=(
+
[gentoo-commits] repo/gentoo:master commit in: dev-python/libtmux/
commit: 2f5bc0bdfd82d6ba7d4ef83a44642f22d41f6cdd
Author: Patrick McLean gentoo org>
AuthorDate: Thu Apr 30 21:12:59 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Apr 30 23:18:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5bc0bd
dev-python/libtmux-0.8.2-r2: re-add dropped ~arm keyword
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
dev-python/libtmux/libtmux-0.8.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
b/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
index 489daf45be8..8d4578ad429 100644
--- a/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
@@ -13,7 +13,7 @@
SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
RDEPEND=">=app-misc/tmux-3.0a"
[gentoo-commits] proj/releng:master commit in: tools/
commit: 51d806875ebd575a9d6ec71ec3a2c6fc5bf0ee4b
Author: Matt Turner gentoo org>
AuthorDate: Thu Apr 30 23:12:56 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 23:12:56 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=51d80687
catalyst-auto: Add fallback for unset storedir
Signed-off-by: Matt Turner gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f8258545..0cd9275f 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -268,6 +268,7 @@ run_catalyst_commands() {
# Some configs will set this explicitly, so don't clobber it.
: ${BUILD_SRCDIR_BASE:=$(catalyst_var storedir)}
+ : ${BUILD_SRCDIR_BASE:=/var/tmp/catalyst}
# See if we had a recent success.
if [[ ${lastrun} != 0 ]]; then
[gentoo-commits] proj/catalyst:master commit in: doc/, catalyst/base/, catalyst/targets/, catalyst/, /
commit: 5b29d4a88f492f6890d0574d0addefb9e6a13271 Author: Matt Turner gentoo org> AuthorDate: Fri Apr 17 23:31:52 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Apr 30 23:04:34 2020 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5b29d4a8 catalyst: Make and use squashfs snapshots There were a number of problems with catalyst's snapshot system. It was built around using the build system's portdir and had no control over what was in that portdir or when it was updated. As a result, when a stage build failed, it was difficult to tell what the snapshot consistet of precisely or whether it contained a particular recent fix. With snapcache disabled, ebuild repo snapshots were tar'd and compressed and then unpacked into the stage chroot which is an unnecessarily expensive process. Moreover, a porttree has more than 100k small files, which are stored extremely inefficiently on most file systems—a whole porttree is usually around 700M on disk. Just removing all of those files during the cleaning stage is an expensive operation. Instead, we make a compressed squashfs image and mount it in the build chroot. The porttree has many duplicate files, and squashfs deduplicates the files and then compresses, so the result is very efficiently packed: ~38M with gzip -9 compression. The snapshot target has been modified to generate a squashfs image from a bare ebuild git repo. Piping git-archive to tar2sqfs generates the squashfs image in less than 10 seconds on a modern system. The git repo is fetched with --depth=1 to minize bandwidth and disk usage, and git gc is run after fetch to minimize disk usage. Storage requirements for the git ebuild repo with metadata are ~70M. The squashfs snapshot is stored in /var/tmp/catalyst/snapshots/ by default with a name -.sqfs. With this convention, we know the exact point in history that the snapshot was taken. The catalyst-auto script can use the sha1 to get a deterministic timestamp, so that it is independent on when `catalyst -s` was run, but is instead the timestamp of the commit date of the repo's git SHA1. Signed-off-by: Matt Turner gentoo.org> README| 3 +- catalyst/base/stagebase.py| 88 catalyst/base/targetbase.py | 16 +++- catalyst/defaults.py | 2 +- catalyst/main.py | 28 +++ catalyst/targets/embedded.py | 1 - catalyst/targets/livecd_stage1.py | 1 - catalyst/targets/livecd_stage2.py | 1 - catalyst/targets/netboot.py | 1 - catalyst/targets/snapshot.py | 165 +++--- catalyst/targets/stage4.py| 1 - doc/catalyst-config.5.txt | 13 +-- doc/catalyst-spec.5.txt | 4 +- 13 files changed, 139 insertions(+), 185 deletions(-) diff --git a/README b/README index 1a039fca..1cceb63e 100644 --- a/README +++ b/README @@ -18,8 +18,9 @@ Requirements === - Python 3.6 or greater -- An ebuild repository snapshot (or an ebuild tree to create one) - A generic stage3 tarball for your architecture +- A squashfs ebuild repository snapshot + - Or an ebuild git repo with sys-fs/squashfs-tools-ng and dev-vcs/git What is catalyst? diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 9aecf013..41da97b3 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -35,7 +35,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.required_values |= frozenset([ "profile", "rel_type", -"snapshot", +"snapshot_treeish", "source_subpath", "subarch", "target", @@ -149,7 +149,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.set_source_subpath() # Set paths -self.set_snapshot_path() +self.set_snapshot() self.set_root_path() self.set_source_path() self.set_chroot_path() @@ -191,9 +191,8 @@ class StageBase(TargetBase, ClearBase, GenBase): # Setup our mount points. self.mount = MOUNT_DEFAULTS.copy() -# Always unpack snapshot tarball -self.mount['portdir']['enable'] = False - +self.mount['portdir']['source'] = self.snapshot +self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/' + self.settings['repo_name'] self.mount['distdir']['source'] = self.settings['distdir'] self.mount["distdir"]['target'] = self.settings['target_distdir'] @@ -435,21 +434,11 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["destpath"] = normpath(self.settings["chroot_path"]) def set_cleanables(self): -self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*", - self.settings["repo_basedir"] + "/" + -
[gentoo-commits] proj/catalyst:master commit in: targets/support/, catalyst/, catalyst/base/, targets/stage2/, doc/
commit: e2a953e9b9165081e9516d6e08ec3df5b27fe3df
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 22 02:09:19 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 23:04:34 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e2a953e9
catalyst: Remove repo_basedir setting
Its purpose was very confused.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 7 ++-
catalyst/defaults.py | 1 -
doc/catalyst-config.5.txt | 4
targets/stage2/chroot.sh | 2 +-
targets/support/livecdfs-update.sh | 2 +-
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index e1477bb4..1f091829 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -192,7 +192,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.mount = MOUNT_DEFAULTS.copy()
self.mount['portdir']['source'] = self.snapshot
-self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/'
+ self.settings['repo_name']
+self.mount['portdir']['target'] = self.settings['target_portdir']
self.mount['distdir']['source'] = self.settings['distdir']
self.mount["distdir"]['target'] = self.settings['target_distdir']
@@ -1054,11 +1054,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
for hostuseexpand in myuseexpandvars:
myf.write(hostuseexpand + '="' +
' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
-# write out a shipable version
-target_portdir = normpath(self.settings["repo_basedir"] + "/" +
- self.settings["repo_name"])
-myf.write('PORTDIR="%s"\n' % target_portdir)
+myf.write('PORTDIR="%s"\n' % self.settings['target_portdir'])
myf.write('DISTDIR="%s"\n' % self.settings['target_distdir'])
myf.write('PKGDIR="%s"\n' % self.settings['target_pkgdir'])
if setup:
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 9878b426..bbefa3a8 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -65,7 +65,6 @@ confdefaults = {
"pkgdir": "/var/cache/binpkgs",
"port_tmpdir": "/var/tmp/portage",
"PythonDir": "./catalyst",
-"repo_basedir": "/var/db/repos",
"repo_name": "gentoo",
"repos": "%(storedir)s/repos",
"sharedir": "/usr/share/catalyst",
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index c1ebe9dd..b7d493eb 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -108,10 +108,6 @@ Defaults to the host's DISTDIR.
The directory in which git repositories exist for use by the snapshot target.
Defaults to `${storedir}/repos`.
-*repo_basedir*::
-The target repository directory to contain the primary repo (gentoo repo) and
-any overlays. The default location is `/var/db/repos`.
-
*repo_name*::
The name of the main repository (e.g. gentoo). The git repository at
`${repos}/${repo_name}.git` will be used to produce the portdir sqfs
diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index bf98d328..aac9a92d 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -9,7 +9,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen"
echo "$locales" > /etc/locale.gen
## START BUILD
-${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts}
|| exit 1
+${clst_target_portdir}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
# Replace modified /etc/locale.gen with default
etc-update --automode -5
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index b1049671..8297e60d 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -257,7 +257,7 @@ case ${clst_livecd_type} in
USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp
@system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' >
/usr/livecd/systempkgs.txt
# This is my hack to reduce tmpfs usage
- cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass}
/usr/livecd
+ cp -r ${clst_target_portdir}/{profiles,eclass} /usr/livecd
rm -rf
/usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
ln -sf /usr/livecd/gconf /etc/gconf
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
commit: 8754f9e36cf37b050f8b8f04bcf421d68c8670d9 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 30 23:06:12 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 30 23:06:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8754f9e3 dev-db/mysql: fix Manifest Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/mysql/Manifest | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index c02e67dea28..fa46cf5bee5 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,7 +1,6 @@ DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50 SHA512 f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168 DIST mysql-5.7.30-patches-01.tar.xz 6684 BLAKE2B 9350280094619fda0d91eacae573396198954fceb5dc039669d236b1dad98eef306702550b517ef30ee3d0e6721667b6f5549df91e3c15cef6079c00d9ba SHA512 74e8e8794fe54b73776b38296aa42c65547311b80bfe65c88b2f961bd44083e9628eb47da4ebcf4c20e2d7c694f514223bcbf29cce27853cca500710ae97778d DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B 2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005 SHA512 bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb -DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B 1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26 SHA512 a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52 DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B 652ce9f99419387e9bcc37afeb1b46438784752e963c3aa1877f17650c31d8b058b4052da97c3a7e9454e758c259d6c311e0518f9a75909fce9741150b82164c SHA512 38acf7c2a10b20c59230ad05cd2cd6996c4c582233c1be573ead08e5c6684275790da07a036570363f89b4d61547b306589b0b98ed5fca70723a3f2cbc21fe11 DIST mysql-boost-5.7.30.tar.gz 51363998 BLAKE2B 7897ad74b685c3b30e7ecdf132fdfa72f3416c05e8d0086cb8f7674b6c4f377fff9abc51ed258cc4dfeab50a2cb393af9076d9c1f9a83a26521facbaf223afa1 SHA512 b75d41d0c72d16c6f8d5393dab6e476b7993d296eb5683c12417ce2da3db2052fdab2a152f6e7c545315d21bfa35f26a247cb6cdab83d3418b5d34ed7f5f9560
[gentoo-commits] proj/catalyst:master commit in: doc/, catalyst/base/
commit: c98bd2b223fab1a2784427d8b09fe8a682647bf4
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 22 00:57:34 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 23:04:34 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c98bd2b2
catalyst: Only write out non-default paths to make.conf
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 11 +++
doc/catalyst-config.5.txt | 19 +--
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1f091829..affdabbe 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -14,7 +14,7 @@ from snakeoil.osutils import pjoin
from DeComp.compress import CompressMap
from catalyst import log
-from catalyst.defaults import (MOUNT_DEFAULTS, PORT_LOGDIR_CLEAN)
+from catalyst.defaults import (confdefaults, MOUNT_DEFAULTS, PORT_LOGDIR_CLEAN)
from catalyst.support import (CatalystError, file_locate, normpath,
cmd, read_makeconf, ismount, file_check)
from catalyst.base.targetbase import TargetBase
@@ -1055,9 +1055,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(hostuseexpand + '="' +
' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
-myf.write('PORTDIR="%s"\n' % self.settings['target_portdir'])
-myf.write('DISTDIR="%s"\n' % self.settings['target_distdir'])
-myf.write('PKGDIR="%s"\n' % self.settings['target_pkgdir'])
+# Write non-default PORTDIR/DISTDIR/PKGDIR settings to make.conf
+for x in ['target_portdir', 'target_distdir', 'target_pkgdir']:
+if self.settings[x] != confdefaults[x]:
+varname = x.split('_')[1].upper()
+myf.write(f'{varname}="{self.settings[x]}"\n')
+
if setup:
# Setup the portage overlay
if "portage_overlay" in self.settings:
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index b7d493eb..11b27d90 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -114,20 +114,19 @@ The name of the main repository (e.g. gentoo). The git
repository at
snapshot.
*target_distdir*::
-This is the target distfiles directory location for the stage being created.
-This is important because this value will be stored in the stage's make.conf
-and will become the default location used if it is not edited by users.
-The default location is `/var/cache/distfiles`.
+Defines the location of the local source file repository in the
+target. This will be written to the target's make.conf if it is not
+the default value of `/var/cache/distfiles`.
*target_pkgdir*::
-This is the target packages directory for storing binpkgs in the stage being
-built. This location is stored in the make.conf of the stage being built.
-The default location is `/var/cache/binpkgs`
+Defines the location of binary packages in the target. This will be
+written to the target's make.conf if it is not the default value of
+`/var/cache/binpkgs`.
*target_portdir*::
-Defines the location of main repository in the target stages. This
-location is stored in make.conf of the stage being built.
-The default location is `/var/db/repos/gentoo`
+Defines the location of the main ebuild repository in the target.
+This will be written to the target's make.conf if it is not the
+default value of `/var/db/repos/gentoo`.
Other settings
~~
[gentoo-commits] proj/catalyst:master commit in: etc/, catalyst/, doc/, catalyst/base/
commit: 2aaf13883fcfb63feb6e90e1670012329b92afdb
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 22 02:02:59 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 23:04:34 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2aaf1388
catalyst: Rename 'portdir' -> 'target_portdir'
With sqfs snapshots, there's now no dependence on the build system's
portdir.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 2 +-
catalyst/defaults.py | 2 +-
doc/catalyst-config.5.txt | 12 +---
etc/catalyst.conf | 3 ---
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 41da97b3..e1477bb4 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -803,7 +803,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
make_profile = Path(self.settings['chroot_path'] +
self.settings['port_conf'],
'make.profile')
make_profile.unlink()
-make_profile.symlink_to(Path('../..' + self.settings['portdir'],
+make_profile.symlink_to(Path('../..' + self.settings['target_portdir'],
'profiles',
self.settings['target_profile']),
target_is_directory=True)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 33f06d34..9878b426 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -63,7 +63,6 @@ confdefaults = {
"make_conf": "%(port_conf)s/make.conf",
"options": set(),
"pkgdir": "/var/cache/binpkgs",
-"portdir": "/var/db/repos/gentoo",
"port_tmpdir": "/var/tmp/portage",
"PythonDir": "./catalyst",
"repo_basedir": "/var/db/repos",
@@ -75,6 +74,7 @@ confdefaults = {
"storedir": "/var/tmp/catalyst",
"target_distdir": "/var/cache/distfiles",
"target_pkgdir": "/var/cache/binpkgs",
+"target_portdir": "/var/db/repos/gentoo",
}
DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf'
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 925934ad..c1ebe9dd 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -28,9 +28,6 @@ and empty lines are interpreted as comments. For example:
digests="auto"
envscript="/etc/catalyst/catalystrc"
options="autoresume bindist kerncache pkgcache seedcache"
-
-# source repo settings
-portdir="/var/db/repos/gentoo"
-
The possible keywords and their meanings are as follows:
@@ -107,10 +104,6 @@ Repository settings
Defines the location of your local source file repository.
Defaults to the host's DISTDIR.
-*portdir*::
-Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should
work for most
-default installations.
-
*repos*::
The directory in which git repositories exist for use by the snapshot target.
Defaults to `${storedir}/repos`.
@@ -135,6 +128,11 @@ This is the target packages directory for storing binpkgs
in the stage being
built. This location is stored in the make.conf of the stage being built.
The default location is `/var/cache/binpkgs`
+*target_portdir*::
+Defines the location of main repository in the target stages. This
+location is stored in make.conf of the stage being built.
+The default location is `/var/db/repos/gentoo`
+
Other settings
~~
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 6a499038..5aa2b3fb 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -52,9 +52,6 @@ envscript="/etc/catalyst/catalystrc"
# (These options can be used together)
options="autoresume bindist kerncache pkgcache seedcache"
-# Source portdir specifies the source portage tree used by the snapshot target.
-portdir="/var/db/repos/gentoo"
-
# source_matching specifies how catalyst will match non-specific file names
# if the filename is not found as an exact match.
# ie: a filename without the extension specified. "/path/to/foo"
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 0a9a4c6f6942417fe26a8ce2d457ed340b4098dd
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 22:59:36 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 22:59:36 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=0a9a4c6f
probe-mirmon: ensure valid return from munge
Signed-off-by: Robin H. Johnson gentoo.org>
probe-mirmon | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/probe-mirmon b/probe-mirmon
index b0c3413..ff73776 100755
--- a/probe-mirmon
+++ b/probe-mirmon
@@ -112,6 +112,8 @@ sub munge_date {
if($timestamp >= $year2020 && $timestamp <= $year2038) {
return $timestamp;
} else {
- return Date::Parse::str2time($timestr);
+ my $timestamp = Date::Parse::str2time($timestr);
+ return $timestamp if defined($timestamp);
}
+ return -1;
}
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: ea8162cb6dde42c2c827bea7c19d7f2eee9d59fd
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 22:56:36 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 22:56:36 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=ea8162cb
probe-mirmon: improve capture usage
Signed-off-by: Robin H. Johnson gentoo.org>
probe-mirmon | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/probe-mirmon b/probe-mirmon
index cd97274..b0c3413 100755
--- a/probe-mirmon
+++ b/probe-mirmon
@@ -83,9 +83,8 @@ sub handle_rsync {
$file =~ s/\W/_/g;# translate all non-letters to _
# https://stackoverflow.com/a/6331618/1583179
- my $ret;
- my ($stdout, $stderr) = capture {
- $ret = system '/usr/bin/rsync', qw( -q --no-motd --timeout ), $timeout,
$url, "$dir/$file";
+ my ($stdout, $stderr, $ret) = capture {
+ system '/usr/bin/rsync', qw( -q --no-motd --timeout ), $timeout, $url,
"$dir/$file";
};
if ($ret!=0) {
#warn "rsync failed, exit code $fail, $! $? $@\n";
[gentoo-commits] proj/catalyst:master commit in: catalyst/
commit: ed0de74506f5ce9741fe61c6c1e46701ee7ca3f0
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 19 18:03:44 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 23 18:20:35 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ed0de745
catalyst: Add a function to get full path of executable
Just a simple wrapper around shutil.which().
Signed-off-by: Matt Turner gentoo.org>
catalyst/support.py | 6 ++
1 file changed, 6 insertions(+)
diff --git a/catalyst/support.py b/catalyst/support.py
index 988a81f5..0925af47 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -3,6 +3,7 @@ import glob
import sys
import os
import re
+import shutil
import time
from subprocess import Popen
@@ -17,6 +18,11 @@ class CatalystError(Exception):
if message:
log.error('CatalystError: %s', message, exc_info=print_traceback)
+def command(name):
+c = shutil.which(name)
+if not c:
+raise CatalystError(f'"{name}" not found or is not executable')
+return c
def cmd(mycmd, env=None, debug=False, fail_func=None):
"""Run the external |mycmd|.
[gentoo-commits] proj/catalyst:master commit in: catalyst/base/
commit: 4c4a82badb5ef8bd472dae7b530ef87a4c1f9127
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 19 01:10:51 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 23 18:20:35 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4c4a82ba
catalyst: Clean up bind()
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 62 +-
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 275c07eb..9aecf013 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -906,35 +906,41 @@ class StageBase(TargetBase, ClearBase, GenBase):
def bind(self):
for x in [x for x in self.mount if self.mount[x]['enable']]:
-log.debug('bind(); x = %s', x)
-target = normpath(self.settings['chroot_path'] +
- self.mount[x]['target'])
-ensure_dirs(target, mode=0o755)
-
-if not os.path.exists(self.mount[x]['source']):
-if self.mount[x]['source'] not in ("maybe_tmpfs", "tmpfs",
"shmfs"):
-ensure_dirs(self.mount[x]['source'], mode=0o755)
-
-src = self.mount[x]['source']
-log.debug('bind(); src = %s', src)
-if src == "maybe_tmpfs":
-if "var_tmpfs_portage" in self.settings:
-_cmd = ['mount', '-t', 'tmpfs',
-'-o', 'size=' +
-self.settings['var_tmpfs_portage'] + 'G',
-src, target]
-elif src == "tmpfs":
-_cmd = ['mount', '-t', 'tmpfs', src, target]
+if str(self.mount[x]['source']) == 'config':
+raise CatalystError(f'"{x}" bind mount source is not
configured')
+if str(self.mount[x]['target']) == 'config':
+raise CatalystError(f'"{x}" bind mount target is not
configured')
+
+source = str(self.mount[x]['source'])
+target = self.settings['chroot_path'] +
str(self.mount[x]['target'])
+
+log.debug('bind %s: "%s" -> "%s"', x, source, target)
+
+if source == 'maybe_tmpfs':
+if 'var_tmpfs_portage' not in self.settings:
+return
+
+_cmd = ['mount', '-t', 'tmpfs', '-o', 'size=' +
+self.settings['var_tmpfs_portage'] + 'G', source,
+target]
+elif source == 'tmpfs':
+_cmd = ['mount', '-t', 'tmpfs', source, target]
+elif source == 'shmfs':
+_cmd = ['mount', '-t', 'tmpfs', '-o', 'noexec,nosuid,nodev',
+'shm', target]
else:
-if src == "shmfs":
-_cmd = ['mount', '-t', 'tmpfs', '-o',
-'noexec,nosuid,nodev', 'shm', target]
-else:
-_cmd = ['mount', '--bind', src, target]
-if _cmd:
-log.debug('bind(); _cmd = %s', _cmd)
-cmd(_cmd, env=self.env, fail_func=self.unbind)
-log.debug('bind(); finished :D')
+_cmd = ['mount', '--bind', source, target]
+
+source = Path(self.mount[x]['source'])
+
+# We may need to create the source of the bind mount. E.g., in
the
+# case of an empty package cache we must create the directory
that
+# the binary packages will be stored into.
+source.mkdir(mode=0o755, exist_ok=True)
+
+Path(target).mkdir(mode=0o755, parents=True, exist_ok=True)
+
+cmd(_cmd, env=self.env, fail_func=self.unbind)
def unbind(self):
ouch = 0
[gentoo-commits] proj/catalyst:master commit in: /, catalyst/targets/, catalyst/base/, catalyst/, doc/
commit: 98cf07d2ca4da1f88e213a520095bfccc9c81ffc Author: Matt Turner gentoo org> AuthorDate: Fri Apr 17 23:31:52 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Apr 30 22:54:49 2020 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=98cf07d2 catalyst: Make and use squashfs snapshots There were a number of problems with catalyst's snapshot system. It was built around using the build system's portdir and had no control over what was in that portdir or when it was updated. As a result, when a stage build failed, it was difficult to tell what the snapshot consistet of precisely or whether it contained a particular recent fix. With snapcache disabled, ebuild repo snapshots were tar'd and compressed and then unpacked into the stage chroot which is an unnecessarily expensive process. Moreover, a porttree has more than 100k small files, which are stored extremely inefficiently on most file systems—a whole porttree is usually around 700M on disk. Just removing all of those files during the cleaning stage is an expensive operation. Instead, we make a compressed squashfs image and mount it in the build chroot. The porttree has many duplicate files, and squashfs deduplicates the files and then compresses, so the result is very efficiently packed: ~38M with gzip -9 compression. The snapshot target has been modified to generate a squashfs image from a bare ebuild git repo. Piping git-archive to tar2sqfs generates the squashfs image in less than 10 seconds on a modern system. The git repo is fetched with --depth=1 to minize bandwidth and disk usage, and git gc is run after fetch to minimize disk usage. Storage requirements for the git ebuild repo with metadata are ~70M. The squashfs snapshot is stored in /var/tmp/catalyst/snapshots/ by default with a name -.sqfs. With this convention, we know the exact point in history that the snapshot was taken. The catalyst-auto script can use the sha1 to get a deterministic timestamp, so that it is independent on when `catalyst -s` was run, but is instead the timestamp of the commit date of the repo's git SHA1. Signed-off-by: Matt Turner gentoo.org> README| 3 +- catalyst/base/stagebase.py| 88 catalyst/base/targetbase.py | 16 +++- catalyst/defaults.py | 2 +- catalyst/main.py | 24 +++--- catalyst/targets/embedded.py | 1 - catalyst/targets/livecd_stage1.py | 1 - catalyst/targets/livecd_stage2.py | 1 - catalyst/targets/netboot.py | 1 - catalyst/targets/snapshot.py | 165 +++--- catalyst/targets/stage4.py| 1 - doc/catalyst-config.5.txt | 13 +-- doc/catalyst-spec.5.txt | 4 +- 13 files changed, 137 insertions(+), 183 deletions(-) diff --git a/README b/README index 1a039fca..1cceb63e 100644 --- a/README +++ b/README @@ -18,8 +18,9 @@ Requirements === - Python 3.6 or greater -- An ebuild repository snapshot (or an ebuild tree to create one) - A generic stage3 tarball for your architecture +- A squashfs ebuild repository snapshot + - Or an ebuild git repo with sys-fs/squashfs-tools-ng and dev-vcs/git What is catalyst? diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 9aecf013..41da97b3 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -35,7 +35,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.required_values |= frozenset([ "profile", "rel_type", -"snapshot", +"snapshot_treeish", "source_subpath", "subarch", "target", @@ -149,7 +149,7 @@ class StageBase(TargetBase, ClearBase, GenBase): self.set_source_subpath() # Set paths -self.set_snapshot_path() +self.set_snapshot() self.set_root_path() self.set_source_path() self.set_chroot_path() @@ -191,9 +191,8 @@ class StageBase(TargetBase, ClearBase, GenBase): # Setup our mount points. self.mount = MOUNT_DEFAULTS.copy() -# Always unpack snapshot tarball -self.mount['portdir']['enable'] = False - +self.mount['portdir']['source'] = self.snapshot +self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/' + self.settings['repo_name'] self.mount['distdir']['source'] = self.settings['distdir'] self.mount["distdir"]['target'] = self.settings['target_distdir'] @@ -435,21 +434,11 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["destpath"] = normpath(self.settings["chroot_path"]) def set_cleanables(self): -self.settings["cleanables"] = ["/etc/resolv.conf", "/var/tmp/*", "/tmp/*", - self.settings["repo_basedir"] + "/" + -
[gentoo-commits] proj/catalyst:master commit in: etc/, doc/, catalyst/base/, catalyst/
commit: 4e908d9934f988c01782b7d4fa8cd9bfa8853efa
Author: Matt Turner gentoo org>
AuthorDate: Thu Apr 9 03:37:16 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 23 18:20:35 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4e908d99
catalyst: Remove snapcache support
Among the problems with snapcache were broken locking, and still needing
to pack and unpack snapshot tarballs. In a few commits, I'm going to
replace it with something significantly better.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 103 +
catalyst/defaults.py | 3 --
doc/catalyst-config.5.txt | 10 +
etc/catalyst.conf | 5 +--
4 files changed, 24 insertions(+), 97 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1c0d98c6..275c07eb 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -152,7 +152,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.set_snapshot_path()
self.set_root_path()
self.set_source_path()
-self.set_snapcache_path()
self.set_chroot_path()
self.set_autoresume_path()
self.set_dest_path()
@@ -192,20 +191,11 @@ class StageBase(TargetBase, ClearBase, GenBase):
# Setup our mount points.
self.mount = MOUNT_DEFAULTS.copy()
-self.mount['portdir']['source'] = self.settings['portdir']
-self.mount['portdir']['target'] =
normpath(self.settings["repo_basedir"]
- + "/" +
- self.settings["repo_name"])
-self.mount['distdir']['source'] = self.settings['distdir']
-self.mount["distdir"]['target'] = self.settings["target_distdir"]
+# Always unpack snapshot tarball
+self.mount['portdir']['enable'] = False
-if "snapcache" not in self.settings["options"]:
-self.mount['portdir']['enable'] = False
-else:
-self.mount['portdir']['source'] = normpath("/".join([
-self.settings['snapshot_cache_path'],
-self.settings['repo_name']
-]))
+self.mount['distdir']['source'] = self.settings['distdir']
+self.mount["distdir"]['target'] = self.settings['target_distdir']
# Configure any user specified options (either in catalyst.conf or on
# the command line).
@@ -461,19 +451,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["snapshot_path_hash"] = \
self.generate_hash(self.settings["snapshot_path"], "sha1")
-def set_snapcache_path(self):
-self.settings["snapshot_cache_path"] = \
-normpath(pjoin(self.settings["snapshot_cache"],
- self.settings["snapshot"]))
-if "snapcache" in self.settings["options"]:
-self.settings["snapshot_cache_path"] = \
-normpath(pjoin(self.settings["snapshot_cache"],
- self.settings["snapshot"]))
-self.snapcache_lock = \
-LockDir(self.settings["snapshot_cache_path"])
-log.info('Setting snapshot cache to %s',
- self.settings['snapshot_cache_path'])
-
def set_chroot_path(self):
"""
NOTE: the trailing slash has been removed
@@ -841,7 +818,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
unpack_info = self.decompressor.create_infodict(
source=self.settings["snapshot_path"],
-destination=self.settings["snapshot_cache_path"],
arch=self.settings["compressor_arch"],
other_options=self.settings["compressor_options"],
)
@@ -850,41 +826,22 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.settings["repo_basedir"] + "/" +
self.settings["repo_name"])
log.info('%s', self.settings['chroot_path'])
log.info('unpack_snapshot(), target_portdir = %s', target_portdir)
-if "snapcache" in self.settings["options"]:
-snapshot_cache_hash_path = pjoin(
-self.settings['snapshot_cache_path'], 'catalyst-hash')
-snapshot_cache_hash = fileutils.readfile(
-snapshot_cache_hash_path, True)
-unpack_info['mode'] = self.decompressor.determine_mode(
-unpack_info['source'])
-
-cleanup_msg = "Cleaning up invalid snapshot cache at \n\t" + \
-self.settings["snapshot_cache_path"] + \
-" (this can take a long time)..."
-
-if self.settings["snapshot_path_hash"] == snapshot_cache_hash:
-log.info(
-'Valid snapshot cache, skipping unpack of portage tree...')
-unpack = False
-else:
-cleanup_msg = \
-'Cleaning up
[gentoo-commits] proj/catalyst:master commit in: doc/, catalyst/base/
commit: 73d70b4f433147d94d6c1e458fe2341dba1dcff7
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 22 00:57:34 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 22:56:12 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=73d70b4f
catalyst: Only write out non-default paths to make.conf
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 11 +++
doc/catalyst-config.5.txt | 19 +--
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 1f091829..affdabbe 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -14,7 +14,7 @@ from snakeoil.osutils import pjoin
from DeComp.compress import CompressMap
from catalyst import log
-from catalyst.defaults import (MOUNT_DEFAULTS, PORT_LOGDIR_CLEAN)
+from catalyst.defaults import (confdefaults, MOUNT_DEFAULTS, PORT_LOGDIR_CLEAN)
from catalyst.support import (CatalystError, file_locate, normpath,
cmd, read_makeconf, ismount, file_check)
from catalyst.base.targetbase import TargetBase
@@ -1055,9 +1055,12 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(hostuseexpand + '="' +
' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
-myf.write('PORTDIR="%s"\n' % self.settings['target_portdir'])
-myf.write('DISTDIR="%s"\n' % self.settings['target_distdir'])
-myf.write('PKGDIR="%s"\n' % self.settings['target_pkgdir'])
+# Write non-default PORTDIR/DISTDIR/PKGDIR settings to make.conf
+for x in ['target_portdir', 'target_distdir', 'target_pkgdir']:
+if self.settings[x] != confdefaults[x]:
+varname = x.split('_')[1].upper()
+myf.write(f'{varname}="{self.settings[x]}"\n')
+
if setup:
# Setup the portage overlay
if "portage_overlay" in self.settings:
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index b7d493eb..11b27d90 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -114,20 +114,19 @@ The name of the main repository (e.g. gentoo). The git
repository at
snapshot.
*target_distdir*::
-This is the target distfiles directory location for the stage being created.
-This is important because this value will be stored in the stage's make.conf
-and will become the default location used if it is not edited by users.
-The default location is `/var/cache/distfiles`.
+Defines the location of the local source file repository in the
+target. This will be written to the target's make.conf if it is not
+the default value of `/var/cache/distfiles`.
*target_pkgdir*::
-This is the target packages directory for storing binpkgs in the stage being
-built. This location is stored in the make.conf of the stage being built.
-The default location is `/var/cache/binpkgs`
+Defines the location of binary packages in the target. This will be
+written to the target's make.conf if it is not the default value of
+`/var/cache/binpkgs`.
*target_portdir*::
-Defines the location of main repository in the target stages. This
-location is stored in make.conf of the stage being built.
-The default location is `/var/db/repos/gentoo`
+Defines the location of the main ebuild repository in the target.
+This will be written to the target's make.conf if it is not the
+default value of `/var/db/repos/gentoo`.
Other settings
~~
[gentoo-commits] proj/catalyst:master commit in: catalyst/
commit: 562a9dddee7038804e6c17d8da79262ad45deaf5 Author: Matt Turner gentoo org> AuthorDate: Sat Apr 18 01:27:31 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Apr 23 18:20:35 2020 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=562a9ddd catalyst: Add a Lock class and refactor LockDir This allows us to make lock files directly. Signed-off-by: Matt Turner gentoo.org> catalyst/lock.py | 29 ++--- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/catalyst/lock.py b/catalyst/lock.py index 5e039fae..ab005163 100644 --- a/catalyst/lock.py +++ b/catalyst/lock.py @@ -8,17 +8,14 @@ from catalyst.fileops import ensure_dirs LockInUse = osutils.LockException - -class LockDir(): -"""An object that creates locks inside dirs""" - -def __init__(self, lockdir): -self.gid = 250 -self.lockfile = os.path.join(lockdir, '.catalyst_lock') -ensure_dirs(lockdir) -fileutils.touch(self.lockfile, mode=0o664) -os.chown(self.lockfile, -1, self.gid) -self.lock = osutils.FsLock(self.lockfile) +class Lock: +""" +A fnctl-based filesystem lock +""" +def __init__(self, lockfile): +fileutils.touch(lockfile, mode=0o664) +os.chown(lockfile, uid=-1, gid=250) +self.lock = osutils.FsLock(lockfile) def read_lock(self): self.lock.acquire_read_lock() @@ -29,3 +26,13 @@ class LockDir(): def unlock(self): # Releasing a write lock is the same as a read lock. self.lock.release_write_lock() + +class LockDir(Lock): +""" +A fnctl-based filesystem lock in a directory +""" +def __init__(self, lockdir): +ensure_dirs(lockdir) +lockfile = os.path.join(lockdir, '.catalyst_lock') + +Lock.__init__(self, lockfile)
[gentoo-commits] proj/catalyst:master commit in: catalyst/
commit: be43719867e694a08699aa07c2f5f519df26b59b Author: Matt Turner gentoo org> AuthorDate: Sat Apr 18 04:33:52 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Apr 23 18:20:35 2020 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=be437198 catalyst: Add read/write_lock contextmanagers Signed-off-by: Matt Turner gentoo.org> catalyst/lock.py | 20 1 file changed, 20 insertions(+) diff --git a/catalyst/lock.py b/catalyst/lock.py index ab005163..e31745b2 100644 --- a/catalyst/lock.py +++ b/catalyst/lock.py @@ -1,6 +1,8 @@ import os +from contextlib import contextmanager + from snakeoil import fileutils from snakeoil import osutils from catalyst.fileops import ensure_dirs @@ -36,3 +38,21 @@ class LockDir(Lock): lockfile = os.path.join(lockdir, '.catalyst_lock') Lock.__init__(self, lockfile) + +@contextmanager +def read_lock(filename): +lock = Lock(filename) +lock.read_lock() +try: +yield +finally: +lock.unlock() + +@contextmanager +def write_lock(filename): +lock = Lock(filename) +lock.write_lock() +try: +yield +finally: +lock.unlock()
[gentoo-commits] proj/catalyst:master commit in: etc/, doc/, catalyst/base/, catalyst/
commit: a3dcb792bb78ec003c1082773ce0b5108de1b512
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 22 02:02:59 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 22:56:12 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a3dcb792
catalyst: Rename 'portdir' -> 'target_portdir'
With sqfs snapshots, there's now no dependence on the build system's
portdir.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 2 +-
catalyst/defaults.py | 2 +-
doc/catalyst-config.5.txt | 12 +---
etc/catalyst.conf | 3 ---
4 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 41da97b3..e1477bb4 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -803,7 +803,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
make_profile = Path(self.settings['chroot_path'] +
self.settings['port_conf'],
'make.profile')
make_profile.unlink()
-make_profile.symlink_to(Path('../..' + self.settings['portdir'],
+make_profile.symlink_to(Path('../..' + self.settings['target_portdir'],
'profiles',
self.settings['target_profile']),
target_is_directory=True)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 33f06d34..9878b426 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -63,7 +63,6 @@ confdefaults = {
"make_conf": "%(port_conf)s/make.conf",
"options": set(),
"pkgdir": "/var/cache/binpkgs",
-"portdir": "/var/db/repos/gentoo",
"port_tmpdir": "/var/tmp/portage",
"PythonDir": "./catalyst",
"repo_basedir": "/var/db/repos",
@@ -75,6 +74,7 @@ confdefaults = {
"storedir": "/var/tmp/catalyst",
"target_distdir": "/var/cache/distfiles",
"target_pkgdir": "/var/cache/binpkgs",
+"target_portdir": "/var/db/repos/gentoo",
}
DEFAULT_CONFIG_FILE = '/etc/catalyst/catalyst.conf'
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 925934ad..c1ebe9dd 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -28,9 +28,6 @@ and empty lines are interpreted as comments. For example:
digests="auto"
envscript="/etc/catalyst/catalystrc"
options="autoresume bindist kerncache pkgcache seedcache"
-
-# source repo settings
-portdir="/var/db/repos/gentoo"
-
The possible keywords and their meanings are as follows:
@@ -107,10 +104,6 @@ Repository settings
Defines the location of your local source file repository.
Defaults to the host's DISTDIR.
-*portdir*::
-Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should
work for most
-default installations.
-
*repos*::
The directory in which git repositories exist for use by the snapshot target.
Defaults to `${storedir}/repos`.
@@ -135,6 +128,11 @@ This is the target packages directory for storing binpkgs
in the stage being
built. This location is stored in the make.conf of the stage being built.
The default location is `/var/cache/binpkgs`
+*target_portdir*::
+Defines the location of main repository in the target stages. This
+location is stored in make.conf of the stage being built.
+The default location is `/var/db/repos/gentoo`
+
Other settings
~~
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 6a499038..5aa2b3fb 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -52,9 +52,6 @@ envscript="/etc/catalyst/catalystrc"
# (These options can be used together)
options="autoresume bindist kerncache pkgcache seedcache"
-# Source portdir specifies the source portage tree used by the snapshot target.
-portdir="/var/db/repos/gentoo"
-
# source_matching specifies how catalyst will match non-specific file names
# if the filename is not found as an exact match.
# ie: a filename without the extension specified. "/path/to/foo"
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 7fcc1ed190b63b194015a60f3a9fe71a63319c9f
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 22:53:34 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 22:53:34 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=7fcc1ed1
probe-mirmon: fix typo
Signed-off-by: Robin H. Johnson gentoo.org>
probe-mirmon | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/probe-mirmon b/probe-mirmon
index 5d99cda..cd97274 100755
--- a/probe-mirmon
+++ b/probe-mirmon
@@ -56,7 +56,7 @@ sub handle_libcurl {
exit 800 unless ($retcode == 0);
my $response_code = $curl->getinfo(CURLINFO_HTTP_CODE);
- exit 801 unless ($response_code == 200)
+ exit 801 unless ($response_code == 200);
exit 802 unless defined($response_body);
chomp $response_body;
print(munge_date($response_body), "\n");
[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/, targets/stage2/, catalyst/, doc/
commit: bec6650faa65d734fbbde63cb5d652e45bff8cac
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 22 02:09:19 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 22:56:12 2020 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bec6650f
catalyst: Remove repo_basedir setting
Its purpose was very confused.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 7 ++-
catalyst/defaults.py | 1 -
doc/catalyst-config.5.txt | 4
targets/stage2/chroot.sh | 2 +-
targets/support/livecdfs-update.sh | 2 +-
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index e1477bb4..1f091829 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -192,7 +192,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.mount = MOUNT_DEFAULTS.copy()
self.mount['portdir']['source'] = self.snapshot
-self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/'
+ self.settings['repo_name']
+self.mount['portdir']['target'] = self.settings['target_portdir']
self.mount['distdir']['source'] = self.settings['distdir']
self.mount["distdir"]['target'] = self.settings['target_distdir']
@@ -1054,11 +1054,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
for hostuseexpand in myuseexpandvars:
myf.write(hostuseexpand + '="' +
' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
-# write out a shipable version
-target_portdir = normpath(self.settings["repo_basedir"] + "/" +
- self.settings["repo_name"])
-myf.write('PORTDIR="%s"\n' % target_portdir)
+myf.write('PORTDIR="%s"\n' % self.settings['target_portdir'])
myf.write('DISTDIR="%s"\n' % self.settings['target_distdir'])
myf.write('PKGDIR="%s"\n' % self.settings['target_pkgdir'])
if setup:
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 9878b426..bbefa3a8 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -65,7 +65,6 @@ confdefaults = {
"pkgdir": "/var/cache/binpkgs",
"port_tmpdir": "/var/tmp/portage",
"PythonDir": "./catalyst",
-"repo_basedir": "/var/db/repos",
"repo_name": "gentoo",
"repos": "%(storedir)s/repos",
"sharedir": "/usr/share/catalyst",
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index c1ebe9dd..b7d493eb 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -108,10 +108,6 @@ Defaults to the host's DISTDIR.
The directory in which git repositories exist for use by the snapshot target.
Defaults to `${storedir}/repos`.
-*repo_basedir*::
-The target repository directory to contain the primary repo (gentoo repo) and
-any overlays. The default location is `/var/db/repos`.
-
*repo_name*::
The name of the main repository (e.g. gentoo). The git repository at
`${repos}/${repo_name}.git` will be used to produce the portdir sqfs
diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index bf98d328..aac9a92d 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -9,7 +9,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen"
echo "$locales" > /etc/locale.gen
## START BUILD
-${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts}
|| exit 1
+${clst_target_portdir}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
# Replace modified /etc/locale.gen with default
etc-update --automode -5
diff --git a/targets/support/livecdfs-update.sh
b/targets/support/livecdfs-update.sh
index b1049671..8297e60d 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -257,7 +257,7 @@ case ${clst_livecd_type} in
USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp
@system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' >
/usr/livecd/systempkgs.txt
# This is my hack to reduce tmpfs usage
- cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass}
/usr/livecd
+ cp -r ${clst_target_portdir}/{profiles,eclass} /usr/livecd
rm -rf
/usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
mv -f /etc/gconf /usr/livecd
ln -sf /usr/livecd/gconf /etc/gconf
[gentoo-commits] proj/releng:master commit in: tools/
commit: 943e1a71819f93c595bbfe5583d4a92baa25dd34
Author: Matt Turner gentoo org>
AuthorDate: Thu Apr 30 04:49:10 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Apr 30 06:04:59 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=943e1a71
catalyst-auto: Support sqfs snapshots
Signed-off-by: Matt Turner gentoo.org>
tools/catalyst-auto | 31 ---
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 66ff5ecc..f8258545 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -279,7 +279,24 @@ run_catalyst_commands() {
fi
fi
- TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
+ if catalyst --help | grep -q "git-treeish"; then
+ snapshot_log=$(mktemp --tmpdir="${TMP_PATH:-/tmp}")
+ if ! run_cmd "${snapshot_log}" catalyst -c "${CATALYST_CONFIG}"
-s stable; then
+ send_email "Catalyst build error - snapshot" ""
"${snapshot_log}"
+ exit 1
+ fi
+
+ read TREEISH gitdir <<<$(egrep -o 'Creating .* tree snapshot
[0-9a-f]{40} from .*' "${snapshot_log}" | cut -d' ' -f5,7)
+ TIMESTAMP=$(git -C "${gitdir}" show --no-patch --format=%cd
--date=format:%Y%m%dT%H%M%SZ "${TREEISH}")
+ else
+ TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
+
+ snapshot_log=$(mktemp --tmpdir="${TMP_PATH:-/tmp}")
+ if ! run_cmd "${snapshot_log}" catalyst -c "${CATALYST_CONFIG}"
-s "${TIMESTAMP}"; then
+ send_email "Catalyst build error - snapshot" ""
"${snapshot_log}"
+ exit 1
+ fi
+ fi
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}"
"catalyst-auto.${TIMESTAMP}.XX")
# Nuke any previous tmpdirs to keep them from accumulating.
@@ -297,6 +314,7 @@ run_catalyst_commands() {
echo "Couldn't create tempdirs!"
exit 1
fi
+ mv "${snapshot_log}" "${TMPDIR}/log/snapshot.log"
if ! run_cmd "${TMPDIR}/log/pre_build.log" pre_build; then
send_email "Catalyst build error - pre_build" "The pre_build
function failed" "${TMPDIR}/log/pre_build.log"
@@ -334,10 +352,15 @@ run_catalyst_commands() {
done
fi
+ if [[ -n ${TREEISH} ]]; then
+ sed -i -e "s|snapshot:.*|snapshot_treeish:
${TREEISH}|g" "${i}"
+ fi
+
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
+ -e "s:@TREEISH@:${TREEISH}:g" \
"${i}"
done
@@ -358,12 +381,6 @@ run_catalyst_commands() {
popd >/dev/null
fi
- # Create snapshot
- if ! run_cmd "${TMPDIR}/log/snapshot.log" catalyst -c
"${CATALYST_CONFIG}" -s "${TIMESTAMP}"; then
- send_email "Catalyst build error - snapshot" ""
"${TMPDIR}/log/snapshot.log"
- exit 1
- fi
-
build_failure=0
timeprefix=()
[gentoo-commits] proj/releng:master commit in: releases/kconfig/powerpc/
commit: 0a25be6d751e16689bc209ad61e087b6712ef31a Author: Matt Turner gentoo org> AuthorDate: Thu Apr 30 22:52:20 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Apr 30 22:53:35 2020 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=0a25be6d kconfig/ppc: Try with BLK_DEV_SR=m, CDROM=m Signed-off-by: Matt Turner gentoo.org> releases/kconfig/powerpc/installcd-ibm-4.19.config| 6 +++--- releases/kconfig/powerpc/installcd-ppc32apple-4.19.config | 8 releases/kconfig/powerpc/installcd-ppc64apple-4.19.config | 8 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/releases/kconfig/powerpc/installcd-ibm-4.19.config b/releases/kconfig/powerpc/installcd-ibm-4.19.config index cac68c16..00cdf59c 100644 --- a/releases/kconfig/powerpc/installcd-ibm-4.19.config +++ b/releases/kconfig/powerpc/installcd-ibm-4.19.config @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Gentoo 9.2.0-r2 p3) 9.2.0 +# Compiler: gcc (Gentoo 9.3.0 p2) 9.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90200 +CONFIG_GCC_VERSION=90300 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -1200,7 +1200,7 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set diff --git a/releases/kconfig/powerpc/installcd-ppc32apple-4.19.config b/releases/kconfig/powerpc/installcd-ppc32apple-4.19.config index 10505e4b..ae3f2c35 100644 --- a/releases/kconfig/powerpc/installcd-ppc32apple-4.19.config +++ b/releases/kconfig/powerpc/installcd-ppc32apple-4.19.config @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Gentoo 9.2.0-r2 p3) 9.2.0 +# Compiler: gcc (Gentoo 9.3.0 p2) 9.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90200 +CONFIG_GCC_VERSION=90300 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -908,7 +908,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m CONFIG_MAC_FLOPPY=m -CONFIG_CDROM=y +CONFIG_CDROM=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=y @@ -1041,7 +1041,7 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set diff --git a/releases/kconfig/powerpc/installcd-ppc64apple-4.19.config b/releases/kconfig/powerpc/installcd-ppc64apple-4.19.config index 627ba938..ce3b5544 100644 --- a/releases/kconfig/powerpc/installcd-ppc64apple-4.19.config +++ b/releases/kconfig/powerpc/installcd-ppc64apple-4.19.config @@ -4,10 +4,10 @@ # # -# Compiler: gcc (Gentoo 9.2.0-r2 p3) 9.2.0 +# Compiler: gcc (Gentoo 9.3.0 p2) 9.3.0 # CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=90200 +CONFIG_GCC_VERSION=90300 CONFIG_CLANG_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_HAS_ASM_GOTO=y @@ -938,7 +938,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_FD is not set -CONFIG_CDROM=y +CONFIG_CDROM=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=y @@ -1073,7 +1073,7 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_BLK_DEV_SD=y # CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y # CONFIG_CHR_DEV_SCH is not set
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 1090b5588fa26cedc773014c9d46cdbf91ea55f7 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Apr 30 22:52:13 2020 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Apr 30 22:52:13 2020 + URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=1090b558 mirmon-wrapper.sh: always shift old args Signed-off-by: Robin H. Johnson gentoo.org> mirmon-wrapper.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh index 2cb6260..0340ec6 100755 --- a/mirmon-wrapper.sh +++ b/mirmon-wrapper.sh @@ -131,19 +131,21 @@ while [[ $# -gt 0 ]]; do XML_SRC=$2 shift 2 ;; - --url) URL=$2 shift 2 ;; --debug) DEBUG=1 + shift ;; --verbose) VERBOSE=1 + shift ;; --help) HELP=1 + shift ;; --) # End of options
[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/
commit: 25628da87f65b59784b078ff90d184e9441673f5
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 22:51:17 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 22:51:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25628da8
media-gfx/imagemagick: security cleanup
Bug: https://bugs.gentoo.org/714608
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/imagemagick/Manifest| 6 -
media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild | 250
media-gfx/imagemagick/imagemagick-6.9.11.1.ebuild | 255 -
media-gfx/imagemagick/imagemagick-6.9.11.3.ebuild | 255 -
media-gfx/imagemagick/imagemagick-7.0.10.0.ebuild | 262 -
media-gfx/imagemagick/imagemagick-7.0.10.1.ebuild | 267 --
media-gfx/imagemagick/imagemagick-7.0.10.3.ebuild | 267 --
7 files changed, 1562 deletions(-)
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 74e129c0813..31340b4b302 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,8 +1,2 @@
-DIST ImageMagick-6.9.11-0.tar.xz 9072040 BLAKE2B
8e3df83c5a009e3a03599a20b9bc2d6f1e91add659d8de150a4ebeafb91218bc62aac25c755a6a1010e00c2d14853a0d8a4849e2b55c899587acdf2d28d8b7c5
SHA512
fe6786365dfe8973e4660f4070cb85335f88985ec9e2484fe382d1f5c1f0123476cdf8e976107072b5ed13b05190f906be89e5215e16dc62e5daebe3ede40bf2
-DIST ImageMagick-6.9.11-1.tar.xz 9069980 BLAKE2B
fbbe707da57a9b1016e89496112b85f1f8500ff35a23015d708c46369c88255c61ed0dd08b8dc2f1160045d91252bab39e9869f490b833f34bd5b7b65d7133a5
SHA512
d18db31d6d2e506203ac530e3d3032c3dfb776fb693788cf813546128dbcb4255522586d8dd5deb9cf0b56a8d503a42929937ee1ec34c8e14ce64568b552bd05
-DIST ImageMagick-6.9.11-3.tar.xz 9068572 BLAKE2B
15ecc7c598c1cad29f6edbd34a83391b6ad8ae0a9d412431d8cd1dc8874afffa73e10bce28aa11f927ee912274d10e1541fc5de3d62a9e58ec57138adf70a8a2
SHA512
2af5029117077100304c366429e961f97a7d8efac7b824f1fcdfdca79f99a34dea1ac99bf8aef23bf4e828bf958722372a9cf073d74ff5a213cd3f9ecb809e76
DIST ImageMagick-6.9.11-7.tar.xz 9075300 BLAKE2B
669c9c4212afd7a8b6c336378b248607991156807522e0c53920bf846f87168deeba12e282a60e977d1056a32eb06302d8b2422d4982060e88048ae79ae8ad3a
SHA512
7eb169679846ae18cc16fbf66d3e5903f4ad38373a4e24c1219fab7a5fe323afd60bd1c540c75931c069116ea8367a89d25c68283276dbfeda67cc4d601b2888
-DIST ImageMagick-7.0.10-0.tar.xz 9532856 BLAKE2B
510e1ac8010b7e2267950e868ce8d0fcd36e37c936c67b1603f4dfdc247cda8dd4aa59fc0d88f5d2a2c0a9a199331cca834797f315814964b68dfad1ab24f355
SHA512
d997429855fa4bc48da32e00ea5c45467a6bd3265c35c0aff8f150346e467451737f276833d4fa867f0e2e52110f532416af1dafdbc8e81d2d11dd0c4c80f011
-DIST ImageMagick-7.0.10-1.tar.xz 9531244 BLAKE2B
e0c16627c23e0ae181e52d73f0c5ec91835fe87eb587e73fc8aff58b0e505e8b78b3c62f842be4d80a787d3f3df404e3e3feb58c80282b828ae623f1cd2fb5ed
SHA512
086616507c073e1a6c8c1276273fee18e9d5ae5ea3a730ad770347459a975c898517985b5a79798b90922e4954cdf994b78daa1ab164cbb48087da389acf6db5
-DIST ImageMagick-7.0.10-3.tar.xz 9699848 BLAKE2B
80aa3d85a3129b9270571bc263eeb66e17010ddbcb82fe5d68257a097ac5ece400d24759a526a72ce9a6a009bf909772aa7f363a56075f45a3c446bc1ac359fe
SHA512
680d88097ca85028cd9b2eba082d482335333687480eb1e0a2a98b9b3d1d04458e9a6c0b77a88324fbc188d6db861c05f9b8ae4157411dc59ebd7494ed4d28dd
DIST ImageMagick-7.0.10-7.tar.xz 9685636 BLAKE2B
20dd94a034038d420906779e78c35c3c7c73370ee7ee29833f63833e8923fb52416a4e4f1a5700795b6722c29dc3b060a3dc1708e267815e86e9e9756200e074
SHA512
020adb329bcc50af52e590b33edc2caf5c0f7b15eacaabd18e5dc9b755314b8238c0b869420662b2b70c406453cf125ed10d2cf0ac94d309c05dfcd7e5820b26
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
deleted file mode 100644
index c2d4023dc3b..000
--- a/media-gfx/imagemagick/imagemagick-6.9.11.0.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs
multilib
-
-MY_PV="$(ver_rs 3 '-')"
-MY_P="ImageMagick-${MY_PV}"
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/;
-SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
- test? ( corefonts )"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/imagemagick/
commit: 39b7886af40cc1b9747373dce91bae61700334b0
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 22:50:23 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 22:51:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b7886a
media-gfx/imagemagick: move stable keywords
Bug: https://bugs.gentoo.org/714608
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild| 2 +-
media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
b/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
index 02b0c9655fe..f37a0010b4c 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/6.9.11"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig
jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32
q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
REQUIRED_USE="corefonts? ( truetype )
diff --git a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
b/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
index 4d2561accf7..386e11f90ca 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.10.7-r1.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc
x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
[gentoo-commits] repo/gentoo:master commit in: net-firewall/nftlb/files/, net-firewall/nftlb/
commit: aa21372a486469fc40fab5a32e618cbbcb4bae56
Author: Patrick McLean sony com>
AuthorDate: Thu Apr 30 22:45:23 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Apr 30 22:45:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa21372a
net-firewall/nftlb: New package
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
net-firewall/nftlb/Manifest| 1 +
net-firewall/nftlb/files/nftlb-0.6-tests.patch | 47 ++
net-firewall/nftlb/metadata.xml| 8
net-firewall/nftlb/nftlb-0.6.ebuild| 55 ++
4 files changed, 111 insertions(+)
diff --git a/net-firewall/nftlb/Manifest b/net-firewall/nftlb/Manifest
new file mode 100644
index 000..db2d378839c
--- /dev/null
+++ b/net-firewall/nftlb/Manifest
@@ -0,0 +1 @@
+DIST nftlb-0.6.tar.gz 121216 BLAKE2B
98b69c35070eb733a218ac1b1aaa7816de1e4f149c8447fee298b4cf50c57610c816fb178d4115e1e7af5cea0f5b20df36eb5b79655e0d7c69ff30e363985104
SHA512
95b879cfc187fe94cc6876f4af3fe77795c1e0228850cfb38b95206685d9065076b6905d365da7ec5f92773cf8f72f6e441d9140d9b10b02eaf9b6c862c31006
diff --git a/net-firewall/nftlb/files/nftlb-0.6-tests.patch
b/net-firewall/nftlb/files/nftlb-0.6-tests.patch
new file mode 100644
index 000..05baa7ee03a
--- /dev/null
+++ b/net-firewall/nftlb/files/nftlb-0.6-tests.patch
@@ -0,0 +1,47 @@
+diff --git a/tests/exec_tests.sh b/tests/exec_tests.sh
+index d96eaa3..b7f812d 100755
+--- a/tests/exec_tests.sh
b/tests/exec_tests.sh
+@@ -33,6 +33,8 @@ fi
+
+ echo "-- Executing configuration tests"
+
++retval=0
++
+ for test in `ls -d ${TESTS}`; do
+ if [[ ! ${test} =~ ^..._ ]]; then
+ continue;
+@@ -55,14 +57,16 @@ for test in `ls -d ${TESTS}`; do
+
+ if [ $statusexec -ne 0 ]; then
+ echo -e "\e[31mNFT EXEC ERROR\e[0m"
++ retval=1
+ continue;
+ fi
+
+ #~ nftfile=`echo ${file} | awk -F'.' '{ print $1 }'`
+- $NFTBIN list ruleset > ${reportfile}
++ $NFTBIN list ruleset > ${reportfile} || retval=1
+
+ if [ ! -f ${outputfile} ]; then
+ echo "Dump file doesn't exist"
++ retval=1
+ continue;
+ fi
+
+@@ -74,6 +78,7 @@ for test in `ls -d ${TESTS}`; do
+ rm -f ${reportfile}
+ else
+ echo -e "\e[31mNFT DUMP ERROR\e[0m"
++ retval=1
+ fi
+ done
+
+@@ -83,4 +88,7 @@ fi
+
+ if [ "`grep 'nft command error' /var/log/syslog`" != "" ]; then
+ echo -e "\e[33m* command errors found, please check syslog\e[0m"
++ retval=1
+ fi
++
++exit ${retval}
diff --git a/net-firewall/nftlb/metadata.xml b/net-firewall/nftlb/metadata.xml
new file mode 100644
index 000..56cae167d37
--- /dev/null
+++ b/net-firewall/nftlb/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+chutz...@gentoo.org
+Patrick McLean
+
+
diff --git a/net-firewall/nftlb/nftlb-0.6.ebuild
b/net-firewall/nftlb/nftlb-0.6.ebuild
new file mode 100644
index 000..2cb16c51601
--- /dev/null
+++ b/net-firewall/nftlb/nftlb-0.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info autotools
+
+DESCRIPTION="nftables load balancer"
+HOMEPAGE="https://github.com/zevenet/nftlb;
+SRC_URI="https://github.com/zevenet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ net-firewall/nftables:=[modern-kernel]
+ dev-libs/jansson:=
+ dev-libs/libev:=
+"
+RDEPEND="${DEPEND}"
+
+# tests need root access
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/nftlb-0.6-tests.patch"
+)
+
+pkg_setup() {
+ local CONFIG_CHECK="~NF_TABLES ~NFT_NUMGEN
+ ~NFT_HASH ~NF_NAT ~IP_NF_NAT"
+
+ linux-info_pkg_setup
+
+ if kernel_is lt 4 19; then
+ eerror "${PN} requires kernel version 4.19 or newer"
+ fi
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_test() {
+ pushd tests >/dev/null || die
+
+ sed -e "s:/var/log/syslog:\"${T}/tests.log\":" \
+ -i exec_tests.sh || die
+
+ ./exec_tests.sh || die "tests failed"
+
+ popd >/dev/null || die
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/cloc/
commit: f7c1ee4d0d80bf277e7c6e624f2d1705fd93d8a5
Author: Matthias Maier gentoo org>
AuthorDate: Thu Apr 30 22:28:48 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 30 22:28:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c1ee4d
dev-util/cloc: mark stable for amd64, x86 using ALLARCHES policy
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
dev-util/cloc/cloc-1.84.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/cloc/cloc-1.84.ebuild b/dev-util/cloc/cloc-1.84.ebuild
index 61220333dbd..aaa2db89040 100644
--- a/dev-util/cloc/cloc-1.84.ebuild
+++ b/dev-util/cloc/cloc-1.84.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
DEPEND="dev-lang/perl"
RDEPEND="${DEPEND}
[gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/
commit: 655fa4da039a460c7f689735f96c1cc1f4157c1c
Author: Matthias Maier gentoo org>
AuthorDate: Thu Apr 30 22:33:16 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 30 22:33:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=655fa4da
sci-chemistry/gelemental: remove dead code
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
sci-chemistry/gelemental/gelemental-2.0.0.ebuild | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sci-chemistry/gelemental/gelemental-2.0.0.ebuild
b/sci-chemistry/gelemental/gelemental-2.0.0.ebuild
index 7a482363201..a77a5cd7a88 100644
--- a/sci-chemistry/gelemental/gelemental-2.0.0.ebuild
+++ b/sci-chemistry/gelemental/gelemental-2.0.0.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
@@ -35,11 +35,6 @@ src_configure() {
default
}
-# src_install() {
-# de
-# autotools-utils_src_install apidir="/usr/share/doc/${PF}/html"
-# }
-
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
[gentoo-commits] repo/gentoo:master commit in: dev-util/cloc/
commit: db436e0d7f0c090d3f7793bb5ab76205818175a8
Author: Matthias Maier gentoo org>
AuthorDate: Thu Apr 30 22:23:27 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 30 22:23:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db436e0d
dev-util/cloc: version bump to 1.84, rekeyword (ALLARCHES policy)
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
dev-util/cloc/Manifest | 1 +
dev-util/cloc/cloc-1.84.ebuild | 31 +++
2 files changed, 32 insertions(+)
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 0c48374dc7a..131026ea4d0 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -2,3 +2,4 @@ DIST cloc-1.72.tar.gz 347245 BLAKE2B
8ce6915322c6cb4682994034525b7c1e3dfa674832c
DIST cloc-1.76.tar.gz 419678 BLAKE2B
bb9ddee89a3efe6d7ea913ddf04a28e4120da82df93ef611f7b19bc9662664787b54a2b063139f8d17db3c69a27f74ff4d2c6263100d68b8d2b92c50ddd2f360
SHA512
3f16f084be1828557e4120a8e41b276336ac240c5de4dc765066277d848ce9af20f31b36ec4beb863066d8b3e9287ea0e0b2a8f1abd15532957f53d2d3935ecd
DIST cloc-1.80.tar.gz 453965 BLAKE2B
63032d0ebff7536a4c0cb07ab7791177310b8544cd878093cc89b753997707768198ed59ff451e6de72bbdd4a9ffd3bf84b113243534c466f6a91befc4593014
SHA512
3f41a0e2bd4becbb393e24834c45d9998217443d5c6d0478be5ce4f9506bb8dcb44088ce4a2c75c06cb6af47b4432f3dc58db9009f9a350a00dd80802109117f
DIST cloc-1.82.tar.gz 494399 BLAKE2B
9bf8e1304d9efbf918b39287342edbd0daadd9e27cedb3a6e5eda9fa8062dc34f56f1e1a949ee1027bb683554ba68aca07d66907795d8bc9ff4ca584c70e83dd
SHA512
31a0b9119cfde77572dc9e79ac01e497de57bd98da97dd94dba8269888bf92c55d47e136dc718b98cf648673aa0ac3205bec5cb7b9363e3b750f01aa0a4f1f90
+DIST cloc-1.84.tar.gz 514868 BLAKE2B
53fa0f0d2c8033619f9f7202802e5fd51013c459bbeed8482a35050be69981e60f3c96879cc2853d509322933050fda52fe17be7ec393783f06a0df5e9cec785
SHA512
85f8af041b0ca858c21e28d3fb7cd9201264afa9e12bd3a14b15a8af3e6e68378dbb02a39dc12140bcbb104424cf38bfa602d2a0683e8c89fa50cbdcf7556b3a
diff --git a/dev-util/cloc/cloc-1.84.ebuild b/dev-util/cloc/cloc-1.84.ebuild
new file mode 100644
index 000..61220333dbd
--- /dev/null
+++ b/dev-util/cloc/cloc-1.84.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="https://github.com/AlDanial/cloc;
+SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+ dev-perl/Algorithm-Diff
+ dev-perl/Parallel-ForkManager
+ dev-perl/Regexp-Common
+ virtual/perl-Digest-MD5
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ virtual/perl-Getopt-Long"
+
+src_compile() {
+ pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
+}
+
+src_install() {
+ doman "${PN}.1"
+ dobin "Unix/${PN}"
+}
[gentoo-commits] repo/gentoo:master commit in: dev-util/cloc/
commit: 4a1f997388a9113b6bac8b74d69d51ffb659b497
Author: Matthias Maier gentoo org>
AuthorDate: Thu Apr 30 22:29:43 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 30 22:29:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1f9973
dev-util/cloc: drop old; drop to testing for uncommon arches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
dev-util/cloc/Manifest| 4
dev-util/cloc/cloc-1.72.ebuild| 30 --
dev-util/cloc/cloc-1.76-r1.ebuild | 31 ---
dev-util/cloc/cloc-1.80.ebuild| 31 ---
dev-util/cloc/cloc-1.82.ebuild| 31 ---
5 files changed, 127 deletions(-)
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index 131026ea4d0..8ec300c62fa 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,5 +1 @@
-DIST cloc-1.72.tar.gz 347245 BLAKE2B
8ce6915322c6cb4682994034525b7c1e3dfa674832c24dd3d3998f3472f83739764aa61beb80ccda51147b663d4555f060b0098fbf307b81418d58ca72b4f14b
SHA512
e83567fcc2703b6de761c44d3b85e4c176eaff9f35419a202bd4c00b5cc9160d39251deb762d57b40aacf4fe6322cf79877032ed29abec2a5f00c1abb8d44021
-DIST cloc-1.76.tar.gz 419678 BLAKE2B
bb9ddee89a3efe6d7ea913ddf04a28e4120da82df93ef611f7b19bc9662664787b54a2b063139f8d17db3c69a27f74ff4d2c6263100d68b8d2b92c50ddd2f360
SHA512
3f16f084be1828557e4120a8e41b276336ac240c5de4dc765066277d848ce9af20f31b36ec4beb863066d8b3e9287ea0e0b2a8f1abd15532957f53d2d3935ecd
-DIST cloc-1.80.tar.gz 453965 BLAKE2B
63032d0ebff7536a4c0cb07ab7791177310b8544cd878093cc89b753997707768198ed59ff451e6de72bbdd4a9ffd3bf84b113243534c466f6a91befc4593014
SHA512
3f41a0e2bd4becbb393e24834c45d9998217443d5c6d0478be5ce4f9506bb8dcb44088ce4a2c75c06cb6af47b4432f3dc58db9009f9a350a00dd80802109117f
-DIST cloc-1.82.tar.gz 494399 BLAKE2B
9bf8e1304d9efbf918b39287342edbd0daadd9e27cedb3a6e5eda9fa8062dc34f56f1e1a949ee1027bb683554ba68aca07d66907795d8bc9ff4ca584c70e83dd
SHA512
31a0b9119cfde77572dc9e79ac01e497de57bd98da97dd94dba8269888bf92c55d47e136dc718b98cf648673aa0ac3205bec5cb7b9363e3b750f01aa0a4f1f90
DIST cloc-1.84.tar.gz 514868 BLAKE2B
53fa0f0d2c8033619f9f7202802e5fd51013c459bbeed8482a35050be69981e60f3c96879cc2853d509322933050fda52fe17be7ec393783f06a0df5e9cec785
SHA512
85f8af041b0ca858c21e28d3fb7cd9201264afa9e12bd3a14b15a8af3e6e68378dbb02a39dc12140bcbb104424cf38bfa602d2a0683e8c89fa50cbdcf7556b3a
diff --git a/dev-util/cloc/cloc-1.72.ebuild b/dev-util/cloc/cloc-1.72.ebuild
deleted file mode 100644
index 8935ab1749b..000
--- a/dev-util/cloc/cloc-1.72.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc;
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- dev-perl/Algorithm-Diff
- dev-perl/Regexp-Common
- virtual/perl-Digest-MD5
- virtual/perl-Getopt-Long
- virtual/perl-File-Spec
- virtual/perl-File-Temp"
-
-src_compile() {
- pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
- doman "${PN}.1"
- dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/cloc-1.76-r1.ebuild
b/dev-util/cloc/cloc-1.76-r1.ebuild
deleted file mode 100644
index 157bd9ba48e..000
--- a/dev-util/cloc/cloc-1.76-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc;
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- dev-perl/Algorithm-Diff
- dev-perl/Parallel-ForkManager
- dev-perl/Regexp-Common
- virtual/perl-Digest-MD5
- virtual/perl-File-Spec
- virtual/perl-File-Temp
- virtual/perl-Getopt-Long"
-
-src_compile() {
- pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
- doman "${PN}.1"
- dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/cloc-1.80.ebuild b/dev-util/cloc/cloc-1.80.ebuild
deleted file mode 100644
index 19fd2288e57..000
--- a/dev-util/cloc/cloc-1.80.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc;
-SRC_URI="https://github.com/AlDanial/${PN}/releases/download/${PV}/${P}.tar.gz;
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="dev-lang/perl"
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/doxypypy/
commit: dfab96f2a505cb3e879fe5cf7fb2ed2c2f261029
Author: Maciej Barć protonmail com>
AuthorDate: Thu Apr 30 21:59:43 2020 +
Commit: Maciej Barć protonmail com>
CommitDate: Thu Apr 30 21:59:43 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dfab96f2
dev-python/doxypypy: new package; add version 0.8.8.6
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Maciej Barć protonmail.com>
dev-python/doxypypy/Manifest| 1 +
dev-python/doxypypy/doxypypy-0.8.8.6.ebuild | 29 +
dev-python/doxypypy/metadata.xml| 12
3 files changed, 42 insertions(+)
diff --git a/dev-python/doxypypy/Manifest b/dev-python/doxypypy/Manifest
new file mode 100644
index 000..837fb07
--- /dev/null
+++ b/dev-python/doxypypy/Manifest
@@ -0,0 +1 @@
+DIST doxypypy-0.8.8.6.tar.gz 39019 BLAKE2B
6f1860ec3f9a33762297cb9b0ccdb3523dfb0855f7eb56ef4d5fe0346e25a0980dd3d007af9d4bc6d3a8502589d8a9701c4d428aa342f6156a6c7aa47a5f1ca1
SHA512
17b69d625187983dcd48ec00c317916493228d999f254dd00d85f826ab45e0a5b73557ab5975d7d64a312161c821c78ef1cbca117e2455d3440b247d45ef8399
diff --git a/dev-python/doxypypy/doxypypy-0.8.8.6.ebuild
b/dev-python/doxypypy/doxypypy-0.8.8.6.ebuild
new file mode 100644
index 000..4657dd5
--- /dev/null
+++ b/dev-python/doxypypy/doxypypy-0.8.8.6.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A more Pythonic version of doxypy, a Doxygen filter for Python"
+HOMEPAGE="https://github.com/Feneric/doxypypy;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+RESTRICT="!test? ( test )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+ test? (
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="
+ dev-python/chardet[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/doxypypy/metadata.xml b/dev-python/doxypypy/metadata.xml
new file mode 100644
index 000..9e54b77
--- /dev/null
+++ b/dev-python/doxypypy/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+x...@protonmail.com
+Maciej Barć
+
+
+Feneric/doxypypy
+doxypypy
+
+
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/ufoNormalizer/
commit: d2fbc46d996a7f72496f641701cb3d1d97ecd4f1
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Apr 30 20:11:58 2020 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 30 22:22:48 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d2fbc46d
dev-python/ufoNormalizer: remove comments
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri gmail.com>
dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
b/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
index 2954c54..5f9ca13 100644
--- a/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
+++ b/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
@@ -20,8 +20,4 @@ DEPEND=""
RDEPEND=""
BDEPEND="app-arch/unzip"
-#python_test() {
-# "${EPYTHON}" esetup.py test || die
-#}
-
distutils_enable_tests setup.py
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/trueskill/
commit: df7f1c6da373043243d8644efb2d1ed229f31957
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Apr 30 22:21:14 2020 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 30 22:22:48 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=df7f1c6d
dev-python/trueskill: new package
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri gmail.com>
dev-python/trueskill/Manifest | 1 +
dev-python/trueskill/metadata.xml | 24
dev-python/trueskill/trueskill-0.4.5.ebuild | 34 +
3 files changed, 59 insertions(+)
diff --git a/dev-python/trueskill/Manifest b/dev-python/trueskill/Manifest
new file mode 100644
index 000..5c56ee0
--- /dev/null
+++ b/dev-python/trueskill/Manifest
@@ -0,0 +1 @@
+DIST trueskill-0.4.5.tar.gz 30714 BLAKE2B
86301c80cca29c11dd58bd01fb2f2d15ebacab6e768038ac7cce4728b642de0d3f6125189079df36919360909967d31a37300970e0db18acfaba573450fa501a
SHA512
c94f7ba2d4aed615e5591a3f1f263d0368962b5a1eeb5e7379a59ed6faeb7af2587438617f2917a0f94dc9fd5ea290932947dcc8925f685a055f131859d2eca6
diff --git a/dev-python/trueskill/metadata.xml
b/dev-python/trueskill/metadata.xml
new file mode 100644
index 000..95805be
--- /dev/null
+++ b/dev-python/trueskill/metadata.xml
@@ -0,0 +1,24 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+https://github.com/sublee/trueskill/issues
+
https://raw.githubusercontent.com/sublee/trueskill/master/changelog.rst
+https://trueskill.org
+
+ s...@subl.ee
+ Heungsub Lee
+
+trueskill
+sublee/trueskill
+
+
+TrueSkill is a rating system among game players. It was developed by Microsoft
Research and has been used on Xbox LIVE for ranking and matchmaking service.
This system quantifies players’ TRUE skill points by the Bayesian inference
algorithm. It also works well with any type of match rule including N:N team
game or free-for-all.
+
+This project is a Python package which implements the TrueSkill rating system:
+
+
diff --git a/dev-python/trueskill/trueskill-0.4.5.ebuild
b/dev-python/trueskill/trueskill-0.4.5.ebuild
new file mode 100644
index 000..b0e5eab
--- /dev/null
+++ b/dev-python/trueskill/trueskill-0.4.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Implementation of the TrueSkill, Glicko and Elo Ranking
Algorithms"
+HOMEPAGE="
+ https://trueskill.org
+ https://github.com/sublee/trueskill
+ https://pypi.org/project/trueskill
+"
+SRC_URI="https://github.com/sublee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND=""
+DEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/almost-0.1.5[${PYTHON_USEDEP}]
+ >=dev-python/mpmath-0.17[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/almost/
commit: 826a3fee85287f889447a514c5f72509799bddaa
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Apr 30 21:41:22 2020 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 30 22:22:48 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=826a3fee
dev-python/almost: new package
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri gmail.com>
dev-python/almost/Manifest| 1 +
dev-python/almost/almost-0.1.5.ebuild | 34 ++
dev-python/almost/metadata.xml| 17 +
3 files changed, 52 insertions(+)
diff --git a/dev-python/almost/Manifest b/dev-python/almost/Manifest
new file mode 100644
index 000..c18f6bb
--- /dev/null
+++ b/dev-python/almost/Manifest
@@ -0,0 +1 @@
+DIST almost-0.1.5.tar.gz 4529 BLAKE2B
098b6fdaf03799fe6269249cfbd1609e514fa2672c3f71bef6feb16e7679a16d1ea45845cfe2d355c4cb1e39936fa356e50af94f1c7d6a67c7491b6bf1fdedcd
SHA512
707bad3a4ef0a910271af93c739a9139b10e5afbadfd329a522ab3992a6a7baf47b0f272154482eabecf3029814542eaef535baea5f7995b7fd39c0a51671b4c
diff --git a/dev-python/almost/almost-0.1.5.ebuild
b/dev-python/almost/almost-0.1.5.ebuild
new file mode 100644
index 000..ff43a4a
--- /dev/null
+++ b/dev-python/almost/almost-0.1.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+COMMIT="cc3eeb0abde7ff95a222d571443989c74a112ff7"
+
+DESCRIPTION="A helper for approximate comparison"
+HOMEPAGE="
+ https://github.com/sublee/almost
+ https://pypi.org/project/almost
+"
+SRC_URI="https://github.com/sublee/almost/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND=""
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+#no tests in pypi tarball
+distutils_enable_tests setup.py
+
+src_prepare() {
+ sed -i "s|distribute|setuptools|" setup.py || die
+ default
+}
diff --git a/dev-python/almost/metadata.xml b/dev-python/almost/metadata.xml
new file mode 100644
index 000..13f1d02
--- /dev/null
+++ b/dev-python/almost/metadata.xml
@@ -0,0 +1,17 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+https://github.com/sublee/almost/issues
+
+ s...@subl.ee
+ Heungsub Lee
+
+almost
+sublee/almost
+
+
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/skills/
commit: 287df4760b327c115960e6cee6fa548fcc51e8db
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Apr 30 19:35:02 2020 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 30 22:22:48 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=287df476
dev-python/skills: new package
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri gmail.com>
dev-python/skills/Manifest| 1 +
dev-python/skills/metadata.xml| 27 +++
dev-python/skills/skills-0.3.0.ebuild | 26 ++
3 files changed, 54 insertions(+)
diff --git a/dev-python/skills/Manifest b/dev-python/skills/Manifest
new file mode 100644
index 000..9a98022
--- /dev/null
+++ b/dev-python/skills/Manifest
@@ -0,0 +1 @@
+DIST skills-0.3.0.zip 37199 BLAKE2B
c27ac509c56ebf1152924c577a0e540a92f658977f5694be3647a658185990611ce30ebf27d755f032eee135a151a2e7228927a9054a502cf528573053789129
SHA512
0f825d0abe1fe9f1733f0be27e62bff97972a43ea09fb6ac4bf64098dfa6bf71c5408a9d0b5cb47fccfd7d539691f31c45787ab82ca408954c9a531553e20989
diff --git a/dev-python/skills/metadata.xml b/dev-python/skills/metadata.xml
new file mode 100644
index 000..fc86a46
--- /dev/null
+++ b/dev-python/skills/metadata.xml
@@ -0,0 +1,27 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+https://github.com/McLeopold/PythonSkills/issues
+
https://raw.githubusercontent.com/McLeopold/PythonSkills/master/CHANGES.rst
+
+ mcleop...@gmail.com
+ Scott Hamilton
+
+skills
+McLeopold/PythonSkills
+
+
+This is a Python port of the Moserware.Skills project that's available at
+
+http://github.com/moserware/Skills
+
+For more details on how the algorithm works, see
+
+http://www.moserware.com/2010/03/computing-your-skill.html
+
+
diff --git a/dev-python/skills/skills-0.3.0.ebuild
b/dev-python/skills/skills-0.3.0.ebuild
new file mode 100644
index 000..e555ea0
--- /dev/null
+++ b/dev-python/skills/skills-0.3.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python Implementation of the TrueSkill, Glicko and Elo Ranking
Algorithms"
+HOMEPAGE="
+ https://github.com/McLeopold/PythonSkills
+ https://pypi.org/project/skills
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="app-arch/unzip"
+
+distutils_enable_tests setup.py
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 89b22bd35232b7c4f10a8961c71f9f6d6077bf61
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 22:17:26 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 22:17:26 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=89b22bd3
mirmon-wrapper.sh: fix arg handling
Signed-off-by: Robin H. Johnson gentoo.org>
mirmon-wrapper.sh | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh
index 04be5ce..2cb6260 100755
--- a/mirmon-wrapper.sh
+++ b/mirmon-wrapper.sh
@@ -20,7 +20,7 @@ helpmsg() {
}
usage() {
- helpmsg "Usage: ${NAME}$(printf " --%s=..." "${OPTIONS_STR[@]}"
)$(printf " --%s" "${OPTIONS_BOOL[@]}")"
+ helpmsg "Usage: ${NAME}$(printf " --%s=..." "${OPTIONS_STR[@]}"
)$(printf " [--%s]" "${OPTIONS_BOOL[@]}")"
exit 3
}
@@ -112,9 +112,9 @@ opts=$(getopt \
eval set --$opts
-MODE=''
-XML_SRC=''
-URL=''
+MODE=
+XML_SRC=
+URL=
HELP=
DEBUG=
VERBOSE=
@@ -138,15 +138,12 @@ while [[ $# -gt 0 ]]; do
;;
--debug)
DEBUG=1
- break
;;
--verbose)
VERBOSE=1
- break
;;
--help)
HELP=1
- break
;;
--)
# End of options
[gentoo-commits] repo/gentoo:master commit in: sci-libs/ginkgo/, sci-libs/ginkgo/files/
commit: be8b6a8f9aa5c220c163e99b37aa1183daf1c5e1
Author: Matthias Maier gentoo org>
AuthorDate: Thu Apr 30 21:03:30 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 30 22:06:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be8b6a8f
sci-libs/ginkgo: improve ebuild
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
.../ginkgo/files/ginkgo-1.1.1-set_soname.patch | 14 +
...{ginkgo-1.1.1.ebuild => ginkgo-1.1.1-r1.ebuild} | 32 +++-
sci-libs/ginkgo/ginkgo-.ebuild | 34 +++---
sci-libs/ginkgo/metadata.xml | 1 +
4 files changed, 63 insertions(+), 18 deletions(-)
diff --git a/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
b/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
new file mode 100644
index 000..9feceee00f7
--- /dev/null
+++ b/sci-libs/ginkgo/files/ginkgo-1.1.1-set_soname.patch
@@ -0,0 +1,14 @@
+diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
+index 8a8ad04..03c6db6 100644
+--- a/cmake/build_helpers.cmake
b/cmake/build_helpers.cmake
+@@ -17,6 +17,9 @@ function(ginkgo_compile_features name)
+ if(GINKGO_WITH_IWYU AND GINKGO_IWYU_PATH)
+ set_property(TARGET "${name}" PROPERTY CXX_INCLUDE_WHAT_YOU_USE
${GINKGO_IWYU_PATH})
+ endif()
++# Set an appropriate SONAME
++set_property(TARGET "${name}" PROPERTY
++SOVERSION "${Ginkgo_VERSION}")
+ if(GINKGO_CHANGED_SHARED_LIBRARY)
+ # Put all shared libraries and corresponding imported libraries into
the specified path
+ set_property(TARGET "${name}" PROPERTY
diff --git a/sci-libs/ginkgo/ginkgo-1.1.1.ebuild
b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
similarity index 51%
rename from sci-libs/ginkgo/ginkgo-1.1.1.ebuild
rename to sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
index a3c8615833d..5348b9a51be 100644
--- a/sci-libs/ginkgo/ginkgo-1.1.1.ebuild
+++ b/sci-libs/ginkgo/ginkgo-1.1.1-r1.ebuild
@@ -8,19 +8,34 @@ inherit cmake-utils
DESCRIPTION="Numerical linear algebra software package"
HOMEPAGE="https://ginkgo-project.github.io/;
-SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo;
+ SRC_URI=""
+ KEYWORDS=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="BSD-with-attribution"
SLOT="0"
-IUSE=""
+IUSE="+openmp cuda"
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE=""
+RDEPEND="
+ cuda? ( dev-util/nvidia-cuda-sdk )"
+DEPEND="${RDEPEND}"
-RDEPEND=""
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.1-set_soname.patch
+)
-DEPEND=""
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && \
+ use openmp && ! tc-has-openmp ; then
+ die "Need an OpenMP capable compiler"
+ fi
+}
src_prepare() {
sed -i \
@@ -38,7 +53,8 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
- -DGINKGO_BUILD_OMP=ON
+ -DGINKGO_BUILD_OMP="$(usex openmp)"
+ -DGINKGO_BUILD_CUDA="$(usex cuda)"
)
cmake-utils_src_configure
}
diff --git a/sci-libs/ginkgo/ginkgo-.ebuild
b/sci-libs/ginkgo/ginkgo-.ebuild
index 3b9102d2165..5348b9a51be 100644
--- a/sci-libs/ginkgo/ginkgo-.ebuild
+++ b/sci-libs/ginkgo/ginkgo-.ebuild
@@ -8,21 +8,34 @@ inherit cmake-utils
DESCRIPTION="Numerical linear algebra software package"
HOMEPAGE="https://ginkgo-project.github.io/;
-inherit git-r3
-EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo;
-SRC_URI=""
-KEYWORDS=""
+if [[ ${PV} = ** ]]; then
+ EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo;
+ SRC_URI=""
+ KEYWORDS=""
+ inherit git-r3
+else
+ SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="BSD-with-attribution"
SLOT="0"
-IUSE=""
+IUSE="+openmp cuda"
-# TODO: add slepc use flag once slepc is packaged for gentoo-science
-REQUIRED_USE=""
+RDEPEND="
+ cuda? ( dev-util/nvidia-cuda-sdk )"
+DEPEND="${RDEPEND}"
-RDEPEND=""
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.1-set_soname.patch
+)
-DEPEND=""
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != binary ]] && \
+ use openmp && ! tc-has-openmp ; then
+ die "Need an OpenMP capable compiler"
+ fi
+}
src_prepare() {
sed -i \
@@ -40,7 +53,8 @@ src_configure() {
-DGINKGO_BUILD_TESTS=OFF
-DGINKGO_BUILD_BENCHMARKS=OFF
-DGINKGO_BUILD_REFERENCE=ON
-
[gentoo-commits] proj/musl:master commit in: sys-fs/lvm2/, sys-fs/lvm2/files/
commit: a5efd9c0877f5e41e6e33cb3ccbf09b69422ca6c
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu Apr 30 21:54:16 2020 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Thu Apr 30 21:54:55 2020 +
URL:https://gitweb.gentoo.org/proj/musl.git/commit/?id=a5efd9c0
sys-fs/lvm2: re-add reopen_stream patch
reported by thyrc on IRC
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev gentoo.org>
...183-implement-libc-specific-reopen_stream.patch | 24 ++
...-2.02.187-r2.ebuild => lvm2-2.02.187-r3.ebuild} | 1 +
2 files changed, 25 insertions(+)
diff --git
a/sys-fs/lvm2/files/lvm2-2.02.183-implement-libc-specific-reopen_stream.patch
b/sys-fs/lvm2/files/lvm2-2.02.183-implement-libc-specific-reopen_stream.patch
new file mode 100644
index 000..6034be3
--- /dev/null
+++
b/sys-fs/lvm2/files/lvm2-2.02.183-implement-libc-specific-reopen_stream.patch
@@ -0,0 +1,24 @@
+diff --git a/lib/log/log.c b/lib/log/log.c
+index 79fbd7a..0999d10 100644
+--- a/lib/log/log.c
b/lib/log/log.c
+@@ -161,6 +161,7 @@ static void _check_and_replace_standard_log_streams(FILE
*old_stream, FILE *new_
+ * Close and reopen standard stream on file descriptor fd.
+ */
+ int reopen_standard_stream(FILE **stream, const char *mode)
++#ifdef __GLIBC__
+ {
+ int fd, fd_copy, new_fd;
+ const char *name;
+@@ -207,6 +208,11 @@ int reopen_standard_stream(FILE **stream, const char
*mode)
+ *stream = new_stream;
+ return 1;
+ }
++#else
++{
++return (freopen(NULL, mode, *stream) != NULL);
++}
++#endif
+
+ void init_log_fn(lvm2_log_fn_t log_fn)
+ {
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
b/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild
similarity index 99%
rename from sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
rename to sys-fs/lvm2/lvm2-2.02.187-r3.ebuild
index a134187..91b6d1c 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r3.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
# Musl fixes
"${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch
"${FILESDIR}"/${PN}-2.02.183-portability.patch
+ "${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch
# For upstream -- review and forward:
"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
commit: 692c6d4087ab8d3c0eb7cf178388aba0a01a9304 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 30 21:28:27 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 30 21:42:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=692c6d40 dev-db/mysql: drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/mysql/Manifest | 2 - dev-db/mysql/mysql-5.6.44-r1.ebuild | 837 -- dev-db/mysql/mysql-5.7.26-r1.ebuild | 991 3 files changed, 1830 deletions(-) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 9cf53ff8307..c02e67dea28 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,4 +1,3 @@ -DIST mysql-5.6.44.tar.gz 32531507 BLAKE2B 28fbf49f699eb9f43223ffa186671b119d16016274cc7192db232b85c58123a61154e37193b9b7145c6a650b80b5f6cf838529bc2bc5ea9c78c0dbc39de834d3 SHA512 65ace1c803773ca6c8759d171c09bc93c7d61b8e3208ac9905f82e99087622c9dcca602d2da217741dc62fc6eabe9108ebc7f31facd26705072eae65fcc37077 DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50 SHA512 f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168 DIST mysql-5.7.30-patches-01.tar.xz 6684 BLAKE2B 9350280094619fda0d91eacae573396198954fceb5dc039669d236b1dad98eef306702550b517ef30ee3d0e6721667b6f5549df91e3c15cef6079c00d9ba SHA512 74e8e8794fe54b73776b38296aa42c65547311b80bfe65c88b2f961bd44083e9628eb47da4ebcf4c20e2d7c694f514223bcbf29cce27853cca500710ae97778d DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B 2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005 SHA512 bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb @@ -8,7 +7,6 @@ DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B 652ce9f99419387e9bcc37afeb1b4643 DIST mysql-boost-5.7.30.tar.gz 51363998 BLAKE2B 7897ad74b685c3b30e7ecdf132fdfa72f3416c05e8d0086cb8f7674b6c4f377fff9abc51ed258cc4dfeab50a2cb393af9076d9c1f9a83a26521facbaf223afa1 SHA512 b75d41d0c72d16c6f8d5393dab6e476b7993d296eb5683c12417ce2da3db2052fdab2a152f6e7c545315d21bfa35f26a247cb6cdab83d3418b5d34ed7f5f9560 DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B 61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4 SHA512 5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01 DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B 2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f SHA512 7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99 -DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8 DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B 0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a SHA512 5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1 DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27 SHA512 d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild deleted file mode 100644 index dd4f1b213a7..000 --- a/dev-db/mysql/mysql-5.6.44-r1.ebuild +++ /dev/null @@ -1,837 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MY_EXTRAS_VER="20190817-0024Z" - -CMAKE_MAKEFILE_GENERATOR=emake - -# Keeping eutils in EAPI=6 for emktemp in pkg_config - -inherit eutils flag-o-matic prefix toolchain-funcs \ - user cmake-utils multilib-build -
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: c75c5b45cb04d9ecce515afd44776070b3288221 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 30 21:41:26 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 30 21:42:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75c5b45 profiles: mask gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 906d2e01825..4f6006659dc 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Thomas Deutschmann (2020-04-30) +# Requires =dev-db/mysql-5.7. Masked for removal in 30 days. + (2020-04-30) # Unmaintained. Blocks removal of other dead packages. No Python3 support. # Masked for removal in 30 days. Bug #720190
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
commit: 1d17c28118c0eb467d78c2d7a7432e675cadcbd4
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 21:25:21 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 21:42:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d17c281
dev-db/mysql: bump to v5.7.30
Bug: https://bugs.gentoo.org/717628
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/mysql/Manifest| 2 +
dev-db/mysql/mysql-5.7.30.ebuild | 975 +++
2 files changed, 977 insertions(+)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 6f0e03d7d84..9cf53ff8307 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,11 @@
DIST mysql-5.6.44.tar.gz 32531507 BLAKE2B
28fbf49f699eb9f43223ffa186671b119d16016274cc7192db232b85c58123a61154e37193b9b7145c6a650b80b5f6cf838529bc2bc5ea9c78c0dbc39de834d3
SHA512
65ace1c803773ca6c8759d171c09bc93c7d61b8e3208ac9905f82e99087622c9dcca602d2da217741dc62fc6eabe9108ebc7f31facd26705072eae65fcc37077
DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B
3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50
SHA512
f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168
+DIST mysql-5.7.30-patches-01.tar.xz 6684 BLAKE2B
9350280094619fda0d91eacae573396198954fceb5dc039669d236b1dad98eef306702550b517ef30ee3d0e6721667b6f5549df91e3c15cef6079c00d9ba
SHA512
74e8e8794fe54b73776b38296aa42c65547311b80bfe65c88b2f961bd44083e9628eb47da4ebcf4c20e2d7c694f514223bcbf29cce27853cca500710ae97778d
DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B
2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005
SHA512
bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb
DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B
1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26
SHA512
a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd
DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B
6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497
SHA512
573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B
652ce9f99419387e9bcc37afeb1b46438784752e963c3aa1877f17650c31d8b058b4052da97c3a7e9454e758c259d6c311e0518f9a75909fce9741150b82164c
SHA512
38acf7c2a10b20c59230ad05cd2cd6996c4c582233c1be573ead08e5c6684275790da07a036570363f89b4d61547b306589b0b98ed5fca70723a3f2cbc21fe11
+DIST mysql-boost-5.7.30.tar.gz 51363998 BLAKE2B
7897ad74b685c3b30e7ecdf132fdfa72f3416c05e8d0086cb8f7674b6c4f377fff9abc51ed258cc4dfeab50a2cb393af9076d9c1f9a83a26521facbaf223afa1
SHA512
b75d41d0c72d16c6f8d5393dab6e476b7993d296eb5683c12417ce2da3db2052fdab2a152f6e7c545315d21bfa35f26a247cb6cdab83d3418b5d34ed7f5f9560
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B
61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4
SHA512
5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B
2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f
SHA512
7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B
dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830
SHA512
c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
diff --git a/dev-db/mysql/mysql-5.7.30.ebuild b/dev-db/mysql/mysql-5.7.30.ebuild
new file mode 100644
index 000..ddb4b28d3e1
--- /dev/null
+++ b/dev-db/mysql/mysql-5.7.30.ebuild
@@ -0,0 +1,975 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+# Keeping eutils in EAPI=6 for emktemp in pkg_config
+
+inherit cmake-utils eutils flag-o-matic linux-info \
+ prefix toolchain-funcs multilib-minimal
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-5.7.30-patches-01.tar.xz;
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/
commit: 94ddcffa7db5e30a246fb0bfc358f610c153c664
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 16:54:54 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 21:28:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94ddcffa
media-libs/gegl: Drop 0.4.20
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/gegl/Manifest | 1 -
media-libs/gegl/gegl-0.4.20.ebuild | 160 -
2 files changed, 161 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 08184dac4a7..7449a7b9e9e 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -2,5 +2,4 @@ DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B
29b33bf6aa878b74461e929a96570fca9a56e529
DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B
4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f
SHA512
a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B
a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd
SHA512
38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B
b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0
SHA512
e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
-DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B
0d1087ea983d7fbeb7ea1edb572bea97e9b4e01aaabd5225ba07ab5cee3b369f42fe39691209f38d4d2a87d56997d9756449cafdb6288eb0864b49fb13a6a8ef
SHA512
140ac1543aa24a23aa685dbd7335f21bcbf3d95c41c1451b2383f6d278842bd9f0c8c980ed27c70c67b2fefe9ba01f2d4bd4b77a1cee38ec1332c12ab3fd718d
DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B
3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780
SHA512
3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
diff --git a/media-libs/gegl/gegl-0.4.20.ebuild
b/media-libs/gegl/gegl-0.4.20.ebuild
deleted file mode 100644
index 1f2a9022287..000
--- a/media-libs/gegl/gegl-0.4.20.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson gnome2-utils python-any-r1 vala
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git;
- SRC_URI=""
-else
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz;
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
~x86-solaris"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/;
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg
test tiff umfpack vala v4l webp"
-REQUIRED_USE="
- svg? ( cairo )
- test? ( introspection )
- vala? ( introspection )
-"
-
-RESTRICT="!test? ( test )"
-
-# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
-# so there is no chance to support libav right now (Gentoo bug #567638)
-# If it returns, please check prior GEGL ebuilds for how libav was
integrated. Thanks!
-RDEPEND="
- >=dev-libs/glib-2.44:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.74[introspection?]
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( media-video/ffmpeg:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:0 )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- dev-lang/perl
- >=dev-util/gtk-doc-am-1
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/babl/
commit: 248c07dc801573e42798745efb86e066ad2ae155
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 16:55:45 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 21:28:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248c07dc
media-libs/babl: Drop 0.1.62
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/babl/Manifest | 1 -
media-libs/babl/babl-0.1.62.ebuild | 54 --
2 files changed, 55 deletions(-)
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 1c1bc1e4ca8..e5bd89675be 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -1,3 +1,2 @@
-DIST babl-0.1.62.tar.bz2 698161 BLAKE2B
21fdc009e56d40a8ee08509161dcad10c3f5b41c42ab7f2d64f888762a15b3dd4b6723a4caa4aea7c977179007db4b6e39b6ab9fde4c68bb24ea170ccf29dbd3
SHA512
4d2ba25e39b8dcb122913731861fa04cafd97388a1c354afb2188e8582ac78e9e32f838e2be8e9f41ee9ac582081fdee1d79accb60e824b8b2c12995f96a8293
DIST babl-0.1.66.tar.bz2 706100 BLAKE2B
0de443dd4ea32cd025c8b121f042c24528677f32a6c201f3abedd13fb3a2ce2636d03f4b45eefce2c9f7a86426355af9b584602ca9ebb1a2140ee88f500c2843
SHA512
41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3
DIST babl-0.1.74.tar.xz 294156 BLAKE2B
bb5df4db706f817d9cf8674caed9b758fc1380b9dd33a26b24990eae07543f097c5e5fb68788c02cb2a2c0e68e917bb7a1c68aa0d2f9871dfd3267934291d474
SHA512
97b4a5aad76b7d6dee1835774cee48f866a9513c6454d74c3378068a60359704c1ba106a7542b9ac6a7968b3cf632ed2626b835ec9c7f3fcc6e29968c1e39396
diff --git a/media-libs/babl/babl-0.1.62.ebuild
b/media-libs/babl/babl-0.1.62.ebuild
deleted file mode 100644
index 8a25c028768..000
--- a/media-libs/babl/babl-0.1.62.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == ** ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git;
- SRC_URI=""
-else
- SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 -sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
~x86-solaris"
-fi
-
-DESCRIPTION="A dynamic, any to any, pixel format conversion library"
-HOMEPAGE="http://www.gegl.org/babl/;
-
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3
cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2
- virtual/pkgconfig
-"
-
-src_prepare() {
- default
- [[ ${PV} == ** ]] && eautoreconf
-}
-
-src_configure() {
- # Automagic rsvg support is just for website generation we do not call,
- # so we don't need to fix it
- # w3m is used for dist target thus no issue for us that it is
automagically
- # detected
- econf \
- --disable-docs \
- --disable-static \
- --disable-maintainer-mode \
- $(use_enable altivec) \
- $(use_enable cpu_flags_x86_f16c f16c) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- $(use_enable cpu_flags_x86_sse3 sse3) \
- $(use_enable cpu_flags_x86_sse4_1 sse4_1)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libmypaint/
commit: 57b36f66146a24bc9e61b1f1a740d54ebd15a2fb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 16:59:12 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 21:28:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57b36f66
media-libs/libmypaint: Drop 1.3.0-r1
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/libmypaint/Manifest | 1 -
media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild | 63
2 files changed, 64 deletions(-)
diff --git a/media-libs/libmypaint/Manifest b/media-libs/libmypaint/Manifest
index 02d424b8dd0..bcbe9133d20 100644
--- a/media-libs/libmypaint/Manifest
+++ b/media-libs/libmypaint/Manifest
@@ -1,2 +1 @@
-DIST libmypaint-1.3.0.tar.xz 438160 BLAKE2B
a018ba2dc2b2cf2f771e871a0cb769887d962c18f83315d1c77864f567ae69aa16a1d55b770f46527990995f0dc940516371485d6f3d4f3cc332623fc408c248
SHA512
553eeb3439ffd0c013e33254a16334242583b8bab76d1a3e937f3ed1d7e05a832c6eb26acd7220dce20c6a7d997c32afe828202ce48e25a5fe57b67efd853fcf
DIST libmypaint-1.4.0.tar.xz 441596 BLAKE2B
d8c55f8dfedbb5cc07abe5c38c935abecf38f8e626b7fec83d7f7a29acdc722ededcd729f31e13e655242250f1d46cf44ca0473899b0de9510b062b123a711cb
SHA512
c549a0b8f02976f7863c5ff49d5f16b5c3eae3e6e9e8803fef833edf78cc2a7413dd8dd751ed560c79d2527e0a54b462a92bb8059bcf69271654b2629f583c19
diff --git a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
b/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
deleted file mode 100644
index 38fbc7ccbf6..000
--- a/media-libs/libmypaint/libmypaint-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 xdg-utils toolchain-funcs
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Library for making brushstrokes"
-HOMEPAGE="https://github.com/mypaint/libmypaint;
-SRC_URI="https://github.com/mypaint/libmypaint/releases/download/v${MY_PV}/${MY_P}.tar.xz;
-
-LICENSE="ISC"
-SLOT="0/0" # first soname component for subslot
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 x86"
-IUSE="+gegl introspection nls openmp"
-
-CDEPEND="
- dev-libs/glib:2
- dev-libs/json-c:=
- gegl? (
- media-libs/babl
- media-libs/gegl:0.3[introspection?]
- )
- introspection? ( >=dev-libs/gobject-introspection-1.32 )
- openmp? ( sys-devel/gcc:*[openmp] )
- nls? ( sys-devel/gettext )
- "
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- nls? ( dev-util/intltool )
- "
-RDEPEND="${CDEPEND}
- !
[gentoo-commits] repo/gentoo:master commit in: media-gfx/gimp/
commit: 38a8dfbcac2aee0345ef905b17bcc3b88ec105cd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 16:52:57 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 21:28:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a8dfbc
media-gfx/gimp: Drop 2.10.8-r2 and 2.10.18
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/gimp/Manifest | 1 -
media-gfx/gimp/gimp-2.10.18.ebuild | 211
media-gfx/gimp/gimp-2.10.8-r2.ebuild | 226 ---
3 files changed, 438 deletions(-)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index bab17d977b8..442181d8ffa 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,5 +1,4 @@
DIST gimp-2.10.14.tar.bz2 32786424 BLAKE2B
f1254ab0742cf0190f4e50f001d8120fe655b73d838c3ed56abb0a221c0eaec02e5c838f952d492069d55d89e4c3493c59b38aa2af87df8181f8979213e7659b
SHA512
acbd095361d9211a5a23474693dd170ed76bf4ea5b1df69791f1d975ef5cdaba1e5fb9f5be9f592a360db5826d71eaaf464005075397cb6630070fe32833c030
DIST gimp-2.10.18.tar.bz2 32946467 BLAKE2B
eb1c756ca646ee9ddc42aebe214ad3e2dedf125940dc1b9cfd04a4424bd2b6255041f1bafbda3fc214f93d97e7802372234a42e1daa0ee56caaf0f0bedd908f9
SHA512
88990f2d70508b22f4acadeab6b687e20af19b765ebc6f245d0c99b3dd853fcd3d237c3b7607e50133aa95a1d71931069029dfd7ee94441ff419c542c141bc9f
-DIST gimp-2.10.8.tar.bz2 31954568 BLAKE2B
11f88b1068fa1fe216a54bed27b26b94c3fdb2cbc67e1e444df74a080d00b678f8c81897a6c5fb5956fa107842b0a853ada44d15d51c2e58db7435ddd0f8e999
SHA512
b458dd710b786152f95a8e48a0727b71cac549fccb31ac9e1e6ac3c617652079773ce7076401f8ade750ed38bdc78dfdec3317423f4c4e9c931f78002bd7454e
DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B
673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505
SHA512
84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B
f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec
SHA512
897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
diff --git a/media-gfx/gimp/gimp-2.10.18.ebuild
b/media-gfx/gimp/gimp-2.10.18.ebuild
deleted file mode 100644
index bf39575cfc1..000
--- a/media-gfx/gimp/gimp-2.10.18.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/;
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86"
-
-IUSE="aalib alsa altivec aqua debug doc gnome heif jpeg2k mng openexr
postscript udev unwind vector-icons webp wmf xpm cpu_flags_x86_mmx
cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=app-text/poppler-0.50[cairo]
- >=app-text/poppler-data-0.4.7
- >=dev-libs/atk-2.2.0
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/json-glib-1.2.6
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=gnome-base/librsvg-2.40.6:2
- >=media-gfx/mypaint-brushes-1.3.0
- >=media-libs/babl-0.1.74
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.22:0.4[cairo]
- >=media-libs/gexiv2-0.10.6
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/lcms-2.8:2
- >=media-libs/libmypaint-1.3.0:=
- >=media-libs/libpng-1.6.25:0=
- >=media-libs/tiff-3.5.7:0
- net-libs/glib-networking[ssl]
- sys-libs/zlib
- virtual/jpeg
- >=x11-libs/cairo-1.12.2
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/gtk+-2.24.32:2
- x11-libs/libXcursor
- >=x11-libs/pango-1.29.4
- aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.0 )
- aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
- heif? ( >=media-libs/libheif-1.3.2:= )
- jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
- mng? ( media-libs/libmng:= )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( dev-libs/libgudev:= )
- unwind? ( >=sys-libs/libunwind-1.1.0:= )
- webp? ( >=media-libs/libwebp-0.6.0:= )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
- ${COMMON_DEPEND}
- x11-themes/hicolor-icon-theme
- gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
- ${COMMON_DEPEND}
- >=dev-lang/perl-5.10.0
- dev-libs/appstream-glib
- dev-util/gtk-update-icon-cache
-
[gentoo-commits] repo/gentoo:master commit in: dev-perl/Graph-Easy/
commit: 09ccf143bc9867cd618e6adde19b343ec4e52554
Author: Kent Fredric gentoo org>
AuthorDate: Thu Apr 30 21:25:48 2020 +
Commit: Kent Fredric gentoo org>
CommitDate: Thu Apr 30 21:27:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ccf143
dev-perl/Graph-Easy: Add w/ version=0.760.0 re bug #718722
Closes: https://bugs.gentoo.org/718722
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Kent Fredric gentoo.org>
dev-perl/Graph-Easy/Graph-Easy-0.760.0.ebuild | 34 +++
dev-perl/Graph-Easy/Manifest | 1 +
dev-perl/Graph-Easy/metadata.xml | 39 +++
3 files changed, 74 insertions(+)
diff --git a/dev-perl/Graph-Easy/Graph-Easy-0.760.0.ebuild
b/dev-perl/Graph-Easy/Graph-Easy-0.760.0.ebuild
new file mode 100644
index 000..3edf63650f0
--- /dev/null
+++ b/dev-perl/Graph-Easy/Graph-Easy-0.760.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SHLOMIF
+DIST_VERSION=0.76
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Convert or render graphs (as ASCII, HTML, SVG or via Graphviz)"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=virtual/perl-Scalar-List-Utils-1.130.0
+"
+DEPEND="
+ dev-perl/Module-Build
+"
+BDEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.360.0
+ test? (
+ dev-perl/Test-Differences
+ >=virtual/perl-Test-Simple-0.620.0
+ )
+"
+PERL_RM_FILES=(
+ "t/style-trailing-space.t"
+ "t/pod.t"
+ "t/pod_cov.t"
+)
diff --git a/dev-perl/Graph-Easy/Manifest b/dev-perl/Graph-Easy/Manifest
new file mode 100644
index 000..ca55a2b4b20
--- /dev/null
+++ b/dev-perl/Graph-Easy/Manifest
@@ -0,0 +1 @@
+DIST Graph-Easy-0.76.tar.gz 467184 BLAKE2B
b6024a6f9e2e97d47806eb0b263af11e3e9b6b4fcb52da1107f81db51cae3d005391779e3d670daef7a8a6fd9da2cb969c6d206b5afb62f8c6b253ad882214b8
SHA512
c5f93252a047ccb0c02347f9f138217c1d52b10ba67db100de7d57a716b3da8d564ecbddedd795420eccc6fe4733bd9b3e64d1fda7d203b144c6112d6bfbe6d0
diff --git a/dev-perl/Graph-Easy/metadata.xml b/dev-perl/Graph-Easy/metadata.xml
new file mode 100644
index 000..979a8874c0f
--- /dev/null
+++ b/dev-perl/Graph-Easy/metadata.xml
@@ -0,0 +1,39 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+p...@gentoo.org
+Gentoo Perl Project
+
+
+Graph-Easy
+Graph::Easy
+Graph::Easy::As_ascii
+Graph::Easy::As_graphml
+Graph::Easy::As_graphviz
+Graph::Easy::As_txt
+Graph::Easy::As_vcg
+Graph::Easy::Attributes
+Graph::Easy::Base
+Graph::Easy::Edge
+Graph::Easy::Edge::Cell
+Graph::Easy::Group
+Graph::Easy::Group::Anon
+Graph::Easy::Group::Cell
+Graph::Easy::Layout
+Graph::Easy::Layout::Chain
+Graph::Easy::Layout::Force
+Graph::Easy::Layout::Grid
+Graph::Easy::Layout::Path
+Graph::Easy::Layout::Repair
+Graph::Easy::Layout::Scout
+Graph::Easy::Node
+Graph::Easy::Node::Anon
+Graph::Easy::Node::Cell
+Graph::Easy::Node::Empty
+Graph::Easy::Parser
+Graph::Easy::Parser::Graphviz
+Graph::Easy::Parser::VCG
+Graph::Easy::Util
+
+
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 6167a39af9568ec73795d2568f30a43d86d2381a
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 21:26:38 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 21:26:38 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=6167a39a
mirmon-wrapper.sh: support debug/verbose/quiet
Signed-off-by: Robin H. Johnson gentoo.org>
mirmon-wrapper.sh | 70 +++
1 file changed, 55 insertions(+), 15 deletions(-)
diff --git a/mirmon-wrapper.sh b/mirmon-wrapper.sh
index 74a12d6..04be5ce 100755
--- a/mirmon-wrapper.sh
+++ b/mirmon-wrapper.sh
@@ -2,24 +2,35 @@
NAME=$(basename "$0")
-OPTIONS=(
+OPTIONS_STR=(
"mode"
"xml-src"
"url"
)
+OPTIONS_BOOL=(
+ "help"
+ "debug"
+ "verbose"
+ "quiet"
+)
+
+
+helpmsg() {
+ echo "$*" 1>&2
+}
usage() {
- echo "Usage: ${NAME}$(printf " --%s=..." "${OPTIONS[@]}" )" 1>&2
+ helpmsg "Usage: ${NAME}$(printf " --%s=..." "${OPTIONS_STR[@]}"
)$(printf " --%s" "${OPTIONS_BOOL[@]}")"
exit 3
}
dohelp() {
- echo "${NAME} TODO" 1>&2
+ helpmsg "${NAME} TODO"
exit 0
}
die() {
- echo "$*" 1>&2
+ helpmsg "$*"
exit 2
}
@@ -34,7 +45,17 @@ main() {
VAR_GMIRRORS=${VARDIR}/g.mirrors
EXTRA_MIRRORS=${CONFDIR}/g.mirrors.extra
# Lock outselves
- [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock -en
"${VARDIR}/flock" "$0" "--xml-src=${XML_SRC}" "--mode=${MODE}" "--url=${URL}"
|| :
+ if [ "${FLOCKER}" != "$0" ]; then
+ exec \
+ env FLOCKER="$0" flock -en "${VARDIR}/flock" \
+ "$0" \
+ ${DEBUG:+--debug} \
+ ${QUIET:+--quiet} \
+ ${VERBOSE:+--verbose} \
+ "--xml-src=${XML_SRC}" \
+ "--mode=${MODE}" \
+ "--url=${URL}"
+ fi
# Grab mirrors from the web
mkdir -p "${VARDIR}" "${HTDOCS}" || die "Failed to mkdir"
@@ -52,8 +73,16 @@ main() {
test -w "${VARDIR}/mirmon.state" || die "Cannot write state
file!"
fi
+ MIRMON_OPTS=(
+-c "${CONFFILE}"
+-get update
+ )
+ [[ $VERBOSE -eq 1 ]] && MIRMON_OPTS+=( '-v' )
+ [[ $DEBUG -eq 1 ]] && MIRMON_OPTS+=( '-d' )
+ [[ $QUIET -eq 1 ]] && MIRMON_OPTS+=( '-q' )
+
# run mirmon
- /usr/bin/perl "${MIRMON}" -c "${CONFFILE}" -q -get update || die
"mirmon failed: $?"
+ /usr/bin/perl "${MIRMON}" "${MIRMON_OPTS[@]}" || die "mirmon failed: $?"
# Set up a nice link to our mirror page directly:
sed \
@@ -74,7 +103,8 @@ main() {
}
opts=$(getopt \
- --longoptions "$(printf "%s:," "${OPTIONS[@]}" )" \
+ --longoptions "$(printf "%s:," "${OPTIONS_STR[@]}" )" \
+ --longoptions "$(printf "%s," "${OPTIONS_BOOL[@]}" )" \
--name "$(basename "$0")" \
--options "" \
-- "$@"
@@ -85,8 +115,10 @@ eval set --$opts
MODE=''
XML_SRC=''
URL=''
-HELP=0
-INVALID=0
+HELP=
+DEBUG=
+VERBOSE=
+INVALID=
while [[ $# -gt 0 ]]; do
case "$1" in
@@ -104,6 +136,14 @@ while [[ $# -gt 0 ]]; do
URL=$2
shift 2
;;
+ --debug)
+ DEBUG=1
+ break
+ ;;
+ --verbose)
+ VERBOSE=1
+ break
+ ;;
--help)
HELP=1
break
@@ -143,12 +183,12 @@ for m in "${XML_SRC_INPUTS[@]}"; do
done
[[ $XML_SRC_VALID -eq 1 ]] || XML_SRC=''
-[[ -z "$MODE" ]] && die "--mode must be one of: ${MODE_INPUTS[*]}"
-[[ -z "$XML_SRC" ]] && die "--xml-src must be one of: ${XML_SRC_INPUTS[*]}"
-[[ -z "$URL" ]] && die "--url unset"
+[[ "$INVALID" == 1 ]] && usage
+[[ "$HELP" == 1 ]] && dohelp
-[[ $INVALID -eq 1 ]] && usage
-[[ $HELP -eq 1 ]] && dohelp
+if [[ -z "$MODE" ]]; then helpmsg "--mode must be one of: ${MODE_INPUTS[*]}" ;
INVALID=1 ; fi
+if [[ -z "$XML_SRC" ]]; then helpmsg "--xml-src must be one of:
${XML_SRC_INPUTS[*]}" ; INVALID=1 ; fi
+if [[ -z "$URL" ]]; then helpmsg "--url unset" ; INVALID=1 ; fi
+[[ "$INVALID" == 1 ]] && usage
-OPTS=( ${opts} ) # for flock
main
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 6bf3f8110e00e69c67bbe888b92d512152dfc94b Author: Robin H. Johnson gentoo org> AuthorDate: Thu Apr 30 21:27:14 2020 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Apr 30 21:27:14 2020 + URL: https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=6bf3f811 mirmon: explicitly use --quiet for cronjobs Signed-off-by: Robin H. Johnson gentoo.org> mirmon-distfiles.sh| 1 + mirmon-experimental.sh | 1 + mirmon-releases.sh | 1 + mirmon-rsync.sh| 1 + mirmon-snapshots.sh| 1 + 5 files changed, 5 insertions(+) diff --git a/mirmon-distfiles.sh b/mirmon-distfiles.sh index 0a245e2..e70bf26 100755 --- a/mirmon-distfiles.sh +++ b/mirmon-distfiles.sh @@ -1,5 +1,6 @@ #!/bin/bash exec $(dirname "$0")/mirmon-wrapper.sh \ + --quiet \ --mode=distfiles \ --xml-src=distfiles \ --url=https://www.gentoo.org/downloads/mirrors/ diff --git a/mirmon-experimental.sh b/mirmon-experimental.sh index a48d57f..63b2810 100755 --- a/mirmon-experimental.sh +++ b/mirmon-experimental.sh @@ -1,5 +1,6 @@ #!/bin/bash exec $(dirname "$0")/mirmon-wrapper.sh \ + --quiet \ --mode=experimental \ --xml-src=distfiles \ --url=https://www.gentoo.org/downloads/mirrors/ diff --git a/mirmon-releases.sh b/mirmon-releases.sh index 4839856..5462e04 100755 --- a/mirmon-releases.sh +++ b/mirmon-releases.sh @@ -1,5 +1,6 @@ #!/bin/bash exec $(dirname "$0")/mirmon-wrapper.sh \ + --quiet \ --mode=releases \ --xml-src=distfiles \ --url=https://www.gentoo.org/downloads/mirrors/ diff --git a/mirmon-rsync.sh b/mirmon-rsync.sh index d97e149..6698471 100755 --- a/mirmon-rsync.sh +++ b/mirmon-rsync.sh @@ -1,5 +1,6 @@ #!/bin/bash exec $(dirname "$0")/mirmon-wrapper.sh \ + --quiet \ --mode=rsync \ --xml-src=rsync \ --url=https://www.gentoo.org/support/rsync-mirrors/ diff --git a/mirmon-snapshots.sh b/mirmon-snapshots.sh index bc591bc..e2c0fe5 100755 --- a/mirmon-snapshots.sh +++ b/mirmon-snapshots.sh @@ -1,5 +1,6 @@ #!/bin/bash exec $(dirname "$0")/mirmon-wrapper.sh \ + --quiet \ --mode=snapshots \ --xml-src=distfiles \ --url=https://www.gentoo.org/downloads/mirrors/
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 09d8ae73df86a6a217c3dcc21b8636b4026cd415 Author: Matt Turner gentoo org> AuthorDate: Thu Apr 30 21:19:09 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Apr 30 21:19:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d8ae73 profiles/package.mask: Mask cinnamon for removal Bug: https://bugs.gentoo.org/720190 Signed-off-by: Matt Turner gentoo.org> profiles/package.mask | 15 +++ 1 file changed, 15 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 3323ecc31f5..906d2e01825 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,21 @@ #--- END OF EXAMPLES --- +# Matt Turner (2020-04-30) +# Unmaintained. Blocks removal of other dead packages. No Python3 support. +# Masked for removal in 30 days. Bug #720190 +gnome-extra/cinnamon +gnome-extra/cinnamon-control-center +gnome-extra/cinnamon-desktop +gnome-extra/cinnamon-menus +gnome-extra/cinnamon-screensaver +gnome-extra/cinnamon-session +gnome-extra/cinnamon-settings-daemon +gnome-extra/cinnamon-translations +gnome-extra/cjs +gnome-extra/nemo +x11-wm/muffin + # Bernard Cafarelli (2020-04-30) # Does not compile with latest windowmaker, bug #717418 # Last release in 2007. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: net-im/slack/
commit: f376d2f829f7ba93d33a0ef50aeb80b1236a7951
Author: Georgy Yakovlev gentoo org>
AuthorDate: Thu Apr 30 21:10:13 2020 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Thu Apr 30 21:10:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f376d2f8
net-im/slack: fix installation
Bug: https://bugs.gentoo.org/720134
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev gentoo.org>
net-im/slack/slack-4.4.2.ebuild | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/net-im/slack/slack-4.4.2.ebuild b/net-im/slack/slack-4.4.2.ebuild
index 357452d7818..d4fe07f41db 100644
--- a/net-im/slack/slack-4.4.2.ebuild
+++ b/net-im/slack/slack-4.4.2.ebuild
@@ -48,16 +48,16 @@ RDEPEND="app-accessibility/at-spi2-atk:2[${MULTILIB_USEDEP}]
x11-libs/pango:0[${MULTILIB_USEDEP}]
ayatana? ( dev-libs/libappindicator:3[${MULTILIB_USEDEP}] )"
-QA_PREBUILT="opt/slack/chrome-sandbox
- opt/slack/libEGL.so
- opt/slack/libffmpeg.so
- opt/slack/libGLESv2.so
-
opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
-
opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
- opt/slack/slack
- opt/slack/swiftshader/libEGL.so
- opt/slack/swiftshader/libGLESv2.so
- opt/slack/swiftshader/libvk_swiftshader.so"
+QA_PREBUILT="/opt/slack/chrome-sandbox
+ /opt/slack/libEGL.so
+ /opt/slack/libffmpeg.so
+ /opt/slack/libGLESv2.so
+
/opt/slack/resources/app.asar.unpacked/node_modules/*/*/build/Release/*.node
+
/opt/slack/resources/app.asar.unpacked/node_modules/*/build/Release/*.node
+ /opt/slack/slack
+ /opt/slack/swiftshader/libEGL.so
+ /opt/slack/swiftshader/libGLESv2.so
+ /opt/slack/swiftshader/libvk_swiftshader.so"
S="${WORKDIR}"
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 29f83dc5cca5e06718842753c229bff6f417e244
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 21:10:59 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 21:10:59 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=29f83dc5
probe-mirmon: handle curl error conditions better
Signed-off-by: Robin H. Johnson gentoo.org>
probe-mirmon | 23 ++-
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/probe-mirmon b/probe-mirmon
index 1e10ef1..5d99cda 100755
--- a/probe-mirmon
+++ b/probe-mirmon
@@ -53,19 +53,16 @@ sub handle_libcurl {
my $retcode = $curl->perform;
# Looking at the results...
- if ($retcode == 0) {
- #print("Transfer went ok\n");
-my $response_code = $curl->getinfo(CURLINFO_HTTP_CODE);
-# judge result and next action based on $response_code
- #print("Received response: $response_code $response_body\n");
- chomp $response_body;
- #print("s='$response_body'\n");
-print(munge_date($response_body), "\n");
- } else {
-# Error code, type of error, error message
- #print("An error happened: $retcode ".$curl->strerror($retcode)."
".$curl->errbuf."\n");
- exit 800;
- }
+ exit 800 unless ($retcode == 0);
+
+ my $response_code = $curl->getinfo(CURLINFO_HTTP_CODE);
+ exit 801 unless ($response_code == 200)
+ exit 802 unless defined($response_body);
+ chomp $response_body;
+ print(munge_date($response_body), "\n");
+
+ exit 0;
+ #print("An error happened: $retcode ".$curl->strerror($retcode)."
".$curl->errbuf."\n");
}
[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
commit: f9660ab502123ed7012950079809c0536779dc08
Author: Anthony G. Basile gentoo org>
AuthorDate: Thu Apr 30 20:56:02 2020 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu Apr 30 20:56:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9660ab5
net-misc/curl: remove older versions
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Anthony G. Basile gentoo.org>
net-misc/curl/Manifest | 3 -
net-misc/curl/curl-7.66.0.ebuild| 263 ---
net-misc/curl/curl-7.67.0-r1.ebuild | 264 ---
net-misc/curl/curl-7.69.0.ebuild| 265
4 files changed, 795 deletions(-)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 98e5487c785..0a0b0ff2587 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,6 +1,3 @@
-DIST curl-7.66.0.tar.xz 2414840 BLAKE2B
f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab
SHA512
81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
-DIST curl-7.67.0.tar.xz 2418548 BLAKE2B
818b3d03ac8c4adb8a629147feccebcbd3d89164a77d7cb457924bd44c3069f1b03326861b73c51a6427d7169d40485a509f74edd89b99b760649e7adcdce693
SHA512
1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29
DIST curl-7.68.0.tar.xz 2442788 BLAKE2B
d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269
SHA512
bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
-DIST curl-7.69.0.tar.xz 2466092 BLAKE2B
e47abb6410dff25f642971646ce3bec3dd119e70a6eb53abc21826b315f88db2e180fb7cc0ea2a0435816a3b090cd2926fd1f27e02ba7aa75aad37ba0a298ceb
SHA512
8c151201b09c51cc1437c2f6345036fce88ea5402cd1fd62b76c093e294b87d0c1f61e1dcf6f799f508d8dcfe381589a3815001a8c8bbc085aed0fdca6f2536d
DIST curl-7.69.1.tar.xz 2467272 BLAKE2B
71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937
SHA512
dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
DIST curl-7.70.0.tar.xz 2348780 BLAKE2B
6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf
SHA512
ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
deleted file mode 100644
index 85a43d48022..000
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils prefix multilib-minimal
-
-DESCRIPTION="A Client that groks URLs"
-HOMEPAGE="https://curl.haxx.se/;
-SRC_URI="https://curl.haxx.se/download/${P}.tar.xz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390
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="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink
+progress-meter rtmp samba ssh ssl static-libs test threads"
-IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss
+curl_ssl_openssl curl_ssl_winssl"
-IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
-
-#lead to lots of false negatives, bug #285669
-RESTRICT="test"
-
-RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
- ssl? (
- curl_ssl_gnutls? (
- net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
- dev-libs/nettle:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- curl_ssl_libressl? (
- dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
- )
- curl_ssl_mbedtls? (
- net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- curl_ssl_openssl? (
- dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
- )
- curl_ssl_nss? (
- dev-libs/nss:0[${MULTILIB_USEDEP}]
- app-misc/ca-certificates
- )
- )
- http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
- nghttp3? (
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/curl/
commit: 209eae868a3591f5e85db2cc11eab87e90d78647
Author: Anthony G. Basile gentoo org>
AuthorDate: Thu Apr 30 20:51:48 2020 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Thu Apr 30 20:52:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209eae86
net-misc/curl: version bump to 7.70.0
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Anthony G. Basile gentoo.org>
net-misc/curl/Manifest | 1 +
net-misc/curl/curl-7.70.0.ebuild | 266 +++
2 files changed, 267 insertions(+)
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index c1a5f6e45fc..98e5487c785 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,3 +3,4 @@ DIST curl-7.67.0.tar.xz 2418548 BLAKE2B
818b3d03ac8c4adb8a629147feccebcbd3d89164
DIST curl-7.68.0.tar.xz 2442788 BLAKE2B
d72dbf3c4d6ef7259f0dc9b5347f9289067807246ce6aaab03f3a9c04c17328a8315261dbc08390096571bcad3bbb185a70d15ce83687d7e792bee37318bf269
SHA512
bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c
DIST curl-7.69.0.tar.xz 2466092 BLAKE2B
e47abb6410dff25f642971646ce3bec3dd119e70a6eb53abc21826b315f88db2e180fb7cc0ea2a0435816a3b090cd2926fd1f27e02ba7aa75aad37ba0a298ceb
SHA512
8c151201b09c51cc1437c2f6345036fce88ea5402cd1fd62b76c093e294b87d0c1f61e1dcf6f799f508d8dcfe381589a3815001a8c8bbc085aed0fdca6f2536d
DIST curl-7.69.1.tar.xz 2467272 BLAKE2B
71eee2a8f511ea698f4ebf879bcdccabe11439b2f6c7812cde640f944af93b33dc797c6f4990ddd2a7051d33584dacc005ae011c16a6c1f7ab7fc7258c891937
SHA512
dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa
+DIST curl-7.70.0.tar.xz 2348780 BLAKE2B
6b505d87242bcaa554c4ee6994eb97ca70453521c1e77b5e757677475328c70f41e23e22b3a0eb9be7a299a94d4f1f85a46f7f999f3db8439072626320352ecf
SHA512
ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6
diff --git a/net-misc/curl/curl-7.70.0.ebuild b/net-misc/curl/curl-7.70.0.ebuild
new file mode 100644
index 000..6d8ee271731
--- /dev/null
+++ b/net-misc/curl/curl-7.70.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/;
+SRC_URI="https://curl.haxx.se/download/${P}.tar.xz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~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="adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap
metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet
+tftp threads"
+IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss
+curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" nghttp3 quiche"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+ brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+ ssl? (
+ curl_ssl_gnutls? (
+ net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+ dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_libressl? (
+ dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_mbedtls? (
+ net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ curl_ssl_openssl? (
+ dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+ )
+ curl_ssl_nss? (
+ dev-libs/nss:0[${MULTILIB_USEDEP}]
+ app-misc/ca-certificates
+ )
+ )
+ http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+ nghttp3? (
+ net-libs/nghttp3[${MULTILIB_USEDEP}]
+ net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+ )
+ quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+ idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+ adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+ rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+ ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+ sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#
[gentoo-commits] repo/gentoo:master commit in: dev-db/percona-server/
commit: 99940d3fc6c2aa5383a3aa25d4937c76d95e44e9
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 17:47:52 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 20:44:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99940d3f
dev-db/percona-server: bump to v8.0.19-10
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/percona-server/Manifest |2 +
.../percona-server/percona-server-8.0.19.10.ebuild | 1148
2 files changed, 1150 insertions(+)
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index d14e6835d49..d6e859f244c 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -4,3 +4,5 @@ DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B
bc197f8e541206548d898281
DIST mysql-extras-20200317-0103Z.tar.bz2 344905 BLAKE2B
c4c8bb2acea16663ab32cf291d0a2d52af04448a507ad3a6dc22dfdef4d6ba427582d66e5923d05cd51565286f85c8df5ccabef9a67a4a500574d21e1f708f27
SHA512
d1d34817faf0a1271f906213eea9081c204d745b14f96166f17d5c60a29ec58c05926e7216f135b6e9d5df2ceab373f10fc4e6a652514d99ba34a336571dce1f
DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B
8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871ab0f32378ba3068d083b2b
SHA512
d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b
DIST percona-server-8.0.18-9.tar.gz 256867152 BLAKE2B
34c7b7b320f973313ecd95e658999a17748fc70ff46b1dc58144df02c17b7870cf33d68a555ee8aaaecb66c5b1003e6023154f7100a6f413514e89d495330dd2
SHA512
ce537a160b48e7c3dc35b15a293c39142a5b633111b5c9c5f9c1150476f0faa5e9cf81b34c9ca85286463455e3ae3fce7a200d253d880e3b67b3c71eefdbdcd4
+DIST percona-server-8.0.19-10.tar.gz 490703179 BLAKE2B
731e9498c4934eb53451c202e8b1de93618190d9b6334b761428ab223756d515d958db77515517e6b5db3ba6cd908c8b238c18b63f4c73b256ec251f8b161ff3
SHA512
39aa805474c6655980e70c97e0d2c0f21ae16e2c1e2e9c7e1d615f46320f1615620368fbdfc24f5d1784aae856090856c3ccda3d6f09ed86c6c9ffe3197be90e
+DIST percona-server-8.0.19.10-patches-01.tar.xz 8288 BLAKE2B
2f79c538ac1512b052210439a27b71491917cb9eab08ac3a3b21c188458c2989f0c998d973b8dd654a7d7606acd70ccf374f1e2f5e0088d0c6b96a794dc4c4a5
SHA512
43313797ec405be82f15745185bfab25fda093045f981a8caa8a019522e432415e4b3cca4ca5ffb735d102f98b3c2fccafccbd4695bd2d1f011707f709fcc2b3
diff --git a/dev-db/percona-server/percona-server-8.0.19.10.ebuild
b/dev-db/percona-server/percona-server-8.0.19.10.ebuild
new file mode 100644
index 000..1058698b5f1
--- /dev/null
+++ b/dev-db/percona-server/percona-server-8.0.19.10.ebuild
@@ -0,0 +1,1148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils flag-o-matic linux-info \
+ multiprocessing prefix toolchain-funcs check-reqs
+
+MY_BOOST_VERSION="1.70.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-Server"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/;
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/percona-server/${PN}-8.0.19.10-patches-01.tar.xz;
+
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+
https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs
1- _ ${MY_BOOST_VERSION}).tar.bz2
+ ${PATCH_SET}
+"
+
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server
https://github.com/percona/percona-server;
+DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement
for MySQL"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="cjk cracklib debug jemalloc latin1 libressl numa pam +perl profiling
+ rocksdb router selinux +server tcmalloc test tokudb
tokudb-backup-plugin"
+
+# Tests always fail when libressl is enabled due to hard-coded ciphers in the
tests
+RESTRICT="!test? ( test ) libressl? ( test )"
+
+REQUIRED_USE="?? ( tcmalloc jemalloc )
+ cjk? ( server )
+ jemalloc? ( server )
+ numa? ( server )
+ profiling? ( server )
+ router? ( server )
+ tcmalloc? ( server )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# Shorten the path because the socket path length must be shorter than 107
chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/mysql"
+
+# Be warned, *DEPEND are version-dependant
+# These are used for both runtime and compiletime
+COMMON_DEPEND="
+ >=app-arch/lz4-0_p131:=
+ sys-libs/ncurses:0=
+ >=sys-libs/zlib-1.2.3:0=
+ libressl? ( dev-libs/libressl:0= )
+
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
commit: 354298f979e834d7a95caf530cf61eb580e4b0e6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 19:07:18 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 20:44:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354298f9
dev-db/mysql: bump to v8.0.20
Bug: https://bugs.gentoo.org/717628
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/mysql/Manifest|2 +
dev-db/mysql/mysql-8.0.20.ebuild | 1108 ++
2 files changed, 1110 insertions(+)
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 1ecef78e7c6..6f0e03d7d84 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,11 @@
DIST mysql-5.6.44.tar.gz 32531507 BLAKE2B
28fbf49f699eb9f43223ffa186671b119d16016274cc7192db232b85c58123a61154e37193b9b7145c6a650b80b5f6cf838529bc2bc5ea9c78c0dbc39de834d3
SHA512
65ace1c803773ca6c8759d171c09bc93c7d61b8e3208ac9905f82e99087622c9dcca602d2da217741dc62fc6eabe9108ebc7f31facd26705072eae65fcc37077
DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B
3c629aed1de808acdea6654c7413e6851507c9c5be939ca4b4f5e2796da317e9b518a749bfc03d2b0ef05bd604b39f72e24b751076b9f206b462d21fa5db4f50
SHA512
f9d8bb72e96cc83f1064fe7df2e5fe8317ca9d44c4e776cf7827a61292fbcfccec716806c80d565958383d78fef93a19d61c726687b57680d5f93299291ff168
+DIST mysql-8.0.20-patches-01.tar.xz 7176 BLAKE2B
2fc51986c0a4da60521d0e64b9f8705caf8ec3869af930c9729359c3710059fc78aae176523fdf17d10173b404431f31f9bb23ee5c82fba7cbbb4cb39881c005
SHA512
bf8211cf3873f8672b9d3d1dc42b68a1c635690ffdc2d3393eafa83f060ada9f2eaa63f859bf8eecc24976a733d8c7c3b9632ac70f28b5facf48eae921c7ceeb
DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B
1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26
SHA512
a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd
DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B
6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497
SHA512
573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52
DIST mysql-boost-5.7.29.tar.gz 51417554 BLAKE2B
652ce9f99419387e9bcc37afeb1b46438784752e963c3aa1877f17650c31d8b058b4052da97c3a7e9454e758c259d6c311e0518f9a75909fce9741150b82164c
SHA512
38acf7c2a10b20c59230ad05cd2cd6996c4c582233c1be573ead08e5c6684275790da07a036570363f89b4d61547b306589b0b98ed5fca70723a3f2cbc21fe11
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B
61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4
SHA512
5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
+DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B
2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f
SHA512
7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B
dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830
SHA512
c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28
DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B
bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb
SHA512
be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8
DIST mysql-extras-20200125-1945Z.tar.bz2 344906 BLAKE2B
0e87875efbc221ded43d6f080dc7dce4277b676b538950120c94b962e51d054093286486e5d83ea3e38e1b2d0b12cf81873df50e1cebbe4cff33b54297e6a17a
SHA512
5fcc5d372998db2b8aef32661ff71290791c20c1195a6210ca79c0fda12008906e665f9dc878d3df5a38a95e23ff05b910daa861002c17a1b6de71ef0520bee1
diff --git a/dev-db/mysql/mysql-8.0.20.ebuild b/dev-db/mysql/mysql-8.0.20.ebuild
new file mode 100644
index 000..e6d1693f2a1
--- /dev/null
+++ b/dev-db/mysql/mysql-8.0.20.ebuild
@@ -0,0 +1,1108 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake-utils flag-o-matic linux-info \
+ multiprocessing prefix toolchain-funcs check-reqs
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+# Patch version
+PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.20-patches-01.tar.xz;
+
+SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c++/, dev-db/mysql-connector-c++/files/
commit: 2a0e2f90800f187b1d183c4a209e2669df171b87
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 20:42:37 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 20:44:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0e2f90
dev-db/mysql-connector-c++: bump to v8.0.20
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/mysql-connector-c++/Manifest| 1 +
...connector-c++-8.0.20-fix-libressl-support.patch | 88 ++
.../mysql-connector-c++-8.0.20.ebuild | 44 +++
3 files changed, 133 insertions(+)
diff --git a/dev-db/mysql-connector-c++/Manifest
b/dev-db/mysql-connector-c++/Manifest
index 33a459b80f0..24ff072f74d 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,2 +1,3 @@
DIST mysql-connector-c++-1.1.12.tar.gz 518615 BLAKE2B
386a4753ca3f03999a49a89507da1b1172b3db89797c38403fee4eea86e7108a5e4f91f24a17de86d585c2a3d9e5742a117fa84d9b14aad649f938a597f3dae9
SHA512
d7e132dbc2efda4a77f8ae00c24006a1ade1d0a50f22d89ece453505e6d206427ee7988df29c0d6ef8b396ad6b8d326b6d263a1d4fa08ef5db0966fb4f1479f4
DIST mysql-connector-c++-8.0.19-src.tar.gz 3137484 BLAKE2B
82a2900b0daa00bcfd72d562818ada25fe15901991a896a46ecdd9304e03066c4e7a3804287540559df1c74dbd1b3983b450ab783ee8cb7f0d7ec152f3cdc6b0
SHA512
5987ae31cda3a5db18ceded201ccbe66263b8ab7665ceacf70af6bb6b99130377b40514b96644b0768fd809b36ee02580520923c11c1ede75da15d7bb0bd
+DIST mysql-connector-c++-8.0.20-src.tar.gz 3774428 BLAKE2B
a06114432ab21c36fd0b3b91df2382198b2a48871e8e0bfd8c7a94729ed0e29f33599c078c97670fe9d744b13042db52fb89de2294c75eae670a77112d11d251
SHA512
3edb7c3d4ccf218a3f76afcf83a6d233b7accd236c05105ab3f7a6610cfd8809a78c78142c82fb60fb0931d2ae0f0f8fdc3ce9caf5f0cde7ef54067a7e20270b
diff --git
a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch
new file mode 100644
index 000..f2ae0d02ed7
--- /dev/null
+++
b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.20-fix-libressl-support.patch
@@ -0,0 +1,88 @@
+--- a/cdk/cmake/DepFindSSL.cmake
b/cdk/cmake/DepFindSSL.cmake
+@@ -88,7 +88,7 @@ function(main)
+
+ set(OPENSSL_LIB_DIR "${OPENSSL_LIB_DIR}" CACHE INTERNAL "")
+
+- if(NOT OPENSSL_VERSION_MAJOR EQUAL 1)
++ if(NOT OPENSSL_VERSION_MAJOR VERSION_GREATER_EQUAL 1)
+ message(SEND_ERROR "OpenSSL version 1.x is required but version
${OPENSSL_VERSION} was found")
+ else()
+ message(STATUS "Using OpenSSL version: ${OPENSSL_VERSION}")
+@@ -184,41 +184,35 @@ function(find_openssl)
+
+
+ # Verify version number. Version information looks like:
+- # #define OPENSSL_VERSION_TEXT"OpenSSL 1.1.1a 20 Nov 2018"
++ # #define OPENSSL_VERSION_NUMBER 0x1000103fL
++ # Encoded as MNNFFPPS: major minor fix patch status
+
+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+ OPENSSL_VERSION_NUMBER
+-REGEX "#[ ]*define[\t ]+OPENSSL_VERSION_TEXT"
++REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+ )
+
+- #message("== OPENSSL_VERSION_NUMBER: ${OPENSSL_VERSION_NUMBER}")
+- # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1d-freebsd 10 Sep 2019"
+ STRING(REGEX REPLACE
+-"^.*OPENSSL_VERSION_TEXT[\t ]+\"OpenSSL[\t
]([0-9]+)\\.([0-9]+)\\.([0-9]+)([a-z]|)[\t \\-].*$"
+-"\\1;\\2;\\3;\\4"
+-version_list "${OPENSSL_VERSION_NUMBER}"
++"^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
++OPENSSL_VERSION_MAJOR "${OPENSSL_VERSION_NUMBER}"
++ )
++ STRING(REGEX REPLACE
++"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9]([0-9][0-9]).*$" "\\1"
++OPENSSL_VERSION_MINOR "${OPENSSL_VERSION_NUMBER}"
++ )
++ STRING(REGEX REPLACE
++"^.*OPENSSL_VERSION_NUMBER[\t ]+0x[0-9][0-9][0-9]([0-9][0-9]).*$" "\\1"
++OPENSSL_VERSION_FIX "${OPENSSL_VERSION_NUMBER}"
+ )
+- #message("-- OPENSSL_VERSION: ${version_list}")
+-
+- list(GET version_list 0 OPENSSL_VERSION_MAJOR)
+- math(EXPR OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR})
+-
+- list(GET version_list 1 OPENSSL_VERSION_MINOR)
+- math(EXPR OPENSSL_VERSION_MINOR ${OPENSSL_VERSION_MINOR})
+-
+- list(GET version_list 2 OPENSSL_VERSION_FIX)
+- math(EXPR OPENSSL_VERSION_FIX ${OPENSSL_VERSION_FIX})
+-
+- list(GET version_list 3 OPENSSL_VERSION_PATCH)
+-
+
+
+ set(OPENSSL_VERSION
+-
"${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}${OPENSSL_VERSION_PATCH}"
++"${OPENSSL_VERSION_MAJOR}.${OPENSSL_VERSION_MINOR}.${OPENSSL_VERSION_FIX}"
+ PARENT_SCOPE
+ )
+ set(OPENSSL_VERSION_MAJOR ${OPENSSL_VERSION_MAJOR} PARENT_SCOPE)
+
++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
+
+ find_library(OPENSSL_LIBRARY
+ NAMES ssl ssleay32 ssleay32MD libssl
+--- a/cdk/foundation/connection_openssl.cc
[gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-connector-c/files/, dev-db/mysql-connector-c/
commit: 78c20fc6a719fdcc951c503a3b998b1e7c9c5046
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Apr 30 19:48:00 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Apr 30 20:44:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78c20fc6
dev-db/mysql-connector-c: bump to v8.0.20
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann gentoo.org>
dev-db/mysql-connector-c/Manifest | 1 +
.../files/mysql-connector-c-8.0.20-libressl.patch | 332 +
.../mysql-connector-c-8.0.20.ebuild| 111 +++
3 files changed, 444 insertions(+)
diff --git a/dev-db/mysql-connector-c/Manifest
b/dev-db/mysql-connector-c/Manifest
index 810277618eb..f72027980de 100644
--- a/dev-db/mysql-connector-c/Manifest
+++ b/dev-db/mysql-connector-c/Manifest
@@ -1,2 +1,3 @@
DIST mysql-boost-8.0.19.tar.gz 264147972 BLAKE2B
61a5ccbef1a7a675c85e4e6bda8e5285bdb931e6ee14d4710bf13dfd9157d1095200db2886dc93ea7251d3d59245f35c0bef5ba88ba6aac209b1e080f3b07dc4
SHA512
5ffc03f005ab2585694902e926b6cb2b10059b2b030549eccd3949f9c3b2f02626d02529f940dec003f2d69683856fd1c720ff12f89dfbdc48befaf24a9c4d01
+DIST mysql-boost-8.0.20.tar.gz 266282970 BLAKE2B
2aeb9d6c575ed9dc2d00d3e51e6391c59ffa39156491d9ed2c07e19bb2efb88a14d5a9d4b537c137d71854e39fa3a7fc2b93618118d4fd062e92ba2d83783c6f
SHA512
7a962e9ddec7069008c5ab6ac2801515e2661ca2875afc6141541c03e2f941f4255b3c0d806a4df2fd2f2f1d12323aeb1e456c1d364777a18ccebefad7b22a99
DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B
813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1
SHA512
271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6
diff --git
a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.20-libressl.patch
b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.20-libressl.patch
new file mode 100644
index 000..88f32419239
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.20-libressl.patch
@@ -0,0 +1,332 @@
+From 2108922a8292d74874ede834158c208d81c3cf76 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann
+Date: Thu, 30 Apr 2020 20:01:48 +0200
+Subject: [PATCH 5/5] Add LibreSSL support
+
+Signed-off-by: Thomas Deutschmann
+---
+ cmake/ssl.cmake | 5 +++--
+ mysys/my_md5.cc | 2 ++
+ .../bindings/xcom/xcom/xcom_ssl_transport.c | 6 +-
+ plugin/x/client/xconnection_impl.cc | 4
+ router/src/http/src/tls_client_context.cc | 2 +-
+ router/src/http/src/tls_context.cc| 9 ++--
+ router/src/http/src/tls_server_context.cc | 3 ++-
+ sql-common/client.cc | 2 ++
+ sql/mysqld.cc | 4 +++-
+ sql/sys_vars.cc | 21 +--
+ vio/viossl.cc | 8 +++
+ vio/viosslfactories.cc| 2 ++
+ 12 files changed, 54 insertions(+), 14 deletions(-)
+
+--- a/cmake/ssl.cmake
b/cmake/ssl.cmake
+@@ -222,13 +222,14 @@ MACRO (MYSQL_CHECK_SSL)
+ OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
+ )
+ ENDIF()
+-
IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}"
VERSION_GREATER "1.1.0")
++CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
++IF(HAVE_TLS1_3_VERSION)
+ADD_DEFINITIONS(-DHAVE_TLSv13)
+ ENDIF()
+ IF(OPENSSL_INCLUDE_DIR AND
+OPENSSL_LIBRARY AND
+CRYPTO_LIBRARY AND
+- OPENSSL_MAJOR_VERSION STREQUAL "1"
++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
+ )
+ SET(OPENSSL_FOUND TRUE)
+ FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
+--- a/mysys/my_md5.cc
b/mysys/my_md5.cc
+@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigned
const char *buf,
+ int compute_md5_hash(char *digest, const char *buf, int len) {
+ int retval = 0;
+ int fips_mode = 0;
++#ifndef LIBRESSL_VERSION_NUMBER
+ fips_mode = FIPS_mode();
++#endif
+ /* If fips mode is ON/STRICT restricted method calls will result into abort,
+* skipping call. */
+ if (fips_mode == 0) {
+---
a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
+@@ -329,6 +329,7 @@ error:
+ return 1;
+ }
+
++#ifndef LIBRESSL_VERSION_NUMBER
+ #define OPENSSL_ERROR_LENGTH 512
+ static int configure_ssl_fips_mode(const uint fips_mode) {
+ int rc = -1;
+@@ -352,6 +353,7 @@ static int configure_ssl_fips_mode(const uint fips_mode) {
+ EXIT:
+ return rc;
+ }
++#endif
+
+ static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
+ const char *ca_path) {
+@@ -555,10
[gentoo-commits] repo/gentoo:master commit in: sci-libs/ginkgo/
commit: 8f672be663388bcc425fb61e2799342395ef
Author: Matthias Maier gentoo org>
AuthorDate: Thu Apr 30 20:29:32 2020 +
Commit: Matthias Maier gentoo org>
CommitDate: Thu Apr 30 20:37:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f672be6
sci-libs/ginkgo: new package
This is a future reverse dependency of sci-libs/dealii
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Matthias Maier gentoo.org>
sci-libs/ginkgo/Manifest| 1 +
sci-libs/ginkgo/ginkgo-1.1.1.ebuild | 44 +++
sci-libs/ginkgo/ginkgo-.ebuild | 46 +
sci-libs/ginkgo/metadata.xml| 22 ++
4 files changed, 113 insertions(+)
diff --git a/sci-libs/ginkgo/Manifest b/sci-libs/ginkgo/Manifest
new file mode 100644
index 000..935ba5909f2
--- /dev/null
+++ b/sci-libs/ginkgo/Manifest
@@ -0,0 +1 @@
+DIST ginkgo-1.1.1.tar.gz 11787690 BLAKE2B
75c2c9b2d1e9ba00e3b0a20859af621cdf4aefe7c6e5ec9c7fc34a5368e5bee70d7d2b86ed9b2d9075ab7cc1a3334434fe20329d780f693be45fd7707cdbe27f
SHA512
ab8f2d36453f4e60a4e0a13eddc4a137006c1cc6c9c0db00997dd721dfc06f4401109c5a22ba23a838206cff576d5041d06edaed8823006e69f11e360d1dadce
diff --git a/sci-libs/ginkgo/ginkgo-1.1.1.ebuild
b/sci-libs/ginkgo/ginkgo-1.1.1.ebuild
new file mode 100644
index 000..a3c8615833d
--- /dev/null
+++ b/sci-libs/ginkgo/ginkgo-1.1.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Numerical linear algebra software package"
+HOMEPAGE="https://ginkgo-project.github.io/;
+
+SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+IUSE=""
+
+# TODO: add slepc use flag once slepc is packaged for gentoo-science
+REQUIRED_USE=""
+
+RDEPEND=""
+
+DEPEND=""
+
+src_prepare() {
+ sed -i \
+ -e "s#\"lib\"#\"$(get_libdir)\"#g" \
+ -e "s#\"lib/#\"$(get_libdir)/#g" \
+ cmake/install_helpers.cmake || die "sed failed"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+
+ local mycmakeargs=(
+ -DGINKGO_DEVEL_TOOLS=OFF
+ -DGINKGO_BUILD_TESTS=OFF
+ -DGINKGO_BUILD_BENCHMARKS=OFF
+ -DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_OMP=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/ginkgo/ginkgo-.ebuild
b/sci-libs/ginkgo/ginkgo-.ebuild
new file mode 100644
index 000..3b9102d2165
--- /dev/null
+++ b/sci-libs/ginkgo/ginkgo-.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Numerical linear algebra software package"
+HOMEPAGE="https://ginkgo-project.github.io/;
+
+inherit git-r3
+EGIT_REPO_URI="https://github.com/ginkgo-project/ginkgo;
+SRC_URI=""
+KEYWORDS=""
+
+LICENSE="BSD-with-attribution"
+SLOT="0"
+IUSE=""
+
+# TODO: add slepc use flag once slepc is packaged for gentoo-science
+REQUIRED_USE=""
+
+RDEPEND=""
+
+DEPEND=""
+
+src_prepare() {
+ sed -i \
+ -e "s#\"lib\"#\"$(get_libdir)\"#g" \
+ -e "s#\"lib/#\"$(get_libdir)/#g" \
+ cmake/install_helpers.cmake || die "sed failed"
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+
+ local mycmakeargs=(
+ -DGINKGO_DEVEL_TOOLS=OFF
+ -DGINKGO_BUILD_TESTS=OFF
+ -DGINKGO_BUILD_BENCHMARKS=OFF
+ -DGINKGO_BUILD_REFERENCE=ON
+ -DGINKGO_BUILD_OMP=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/ginkgo/metadata.xml b/sci-libs/ginkgo/metadata.xml
new file mode 100644
index 000..e67b3457031
--- /dev/null
+++ b/sci-libs/ginkgo/metadata.xml
@@ -0,0 +1,22 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ tam...@gentoo.org
+ Matthias Maier
+
+
+ s...@gentoo.org
+ Gentoo Science Project
+
+
+ Ginkgo is a high-performance linear algebra library for manycore
+ systems, with a focus on sparse solution of linear systems. It
is
+ implemented using modern C++, with GPU kernels implemented in
CUDA.
+
+
+
+
+ ginkgo-project/ginkgo
+
+
[gentoo-commits] proj/gentoo-mirrorstats:master commit in: /
commit: 8a60a36dfca344e002faad387f58b01b09cafa22
Author: Robin H. Johnson gentoo org>
AuthorDate: Thu Apr 30 20:29:38 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Thu Apr 30 20:29:38 2020 +
URL:
https://gitweb.gentoo.org/proj/gentoo-mirrorstats.git/commit/?id=8a60a36d
probe-mirmon: make even less stderr
Signed-off-by: Robin H. Johnson gentoo.org>
probe-mirmon | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/probe-mirmon b/probe-mirmon
index 6d67fbf..1e10ef1 100755
--- a/probe-mirmon
+++ b/probe-mirmon
@@ -22,6 +22,7 @@ use warnings;
use Date::Parse (); # dev-perl/TimeDate
use File::Tempdir; # dev-perl/File-Tempdir
use WWW::Curl::Easy;
+use Capture::Tiny qw/capture/;
sub main {
my ( $timeout, $url ) = @_;
@@ -84,9 +85,15 @@ sub handle_rsync {
$file =~ s/\W/_/g;# translate all non-letters to _
- if ( my $fail = system '/usr/bin/rsync', qw( -q --no-motd --timeout ),
$timeout, $url, "$dir/$file", '2>/dev/null' ) {
+ # https://stackoverflow.com/a/6331618/1583179
+ my $ret;
+ my ($stdout, $stderr) = capture {
+ $ret = system '/usr/bin/rsync', qw( -q --no-motd --timeout ), $timeout,
$url, "$dir/$file";
+ };
+ if ($ret!=0) {
#warn "rsync failed, exit code $fail, $! $? $@\n";
-exit $fail;
+ #exit $ret;
+ exit 800;
}
open my $fh, '<', "$dir/$file" or do {
[gentoo-commits] repo/proj/guru:dev commit in: mail-client/mutt-wizard/
commit: 36817721704653f6adc19f66496d7e3828f51f91
Author: Aisha Tammy aisha cc>
AuthorDate: Thu Apr 30 20:12:12 2020 +
Commit: Aisha Tammy aisha cc>
CommitDate: Thu Apr 30 20:12:12 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36817721
mail-client/mutt-wizard: updated to latest commit
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Aisha Tammy aisha.cc>
mail-client/mutt-wizard/Manifest| 2 +-
...utt-wizard-0_pre20200412.ebuild => mutt-wizard-0_pre20200430.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-client/mutt-wizard/Manifest b/mail-client/mutt-wizard/Manifest
index 7ceed08..ac35dc4 100644
--- a/mail-client/mutt-wizard/Manifest
+++ b/mail-client/mutt-wizard/Manifest
@@ -1 +1 @@
-DIST mutt-wizard-0_pre20200412.tar.gz 31845 BLAKE2B
db798819fb403e0e8cc473dd31fecc4c4ad62ef0748b714fb9c11555bad4865ba8e43795f9cfc553ec103fa80dee51acd09c59991836b974bbfccca4d465212d
SHA512
a37c85e23b473834a2f4c95666ae019323cac40115aeb8d7265de26ed0c4456199870909ba9aa4fb10cac5606892382f3b3efa55afcf6494ef900a2881cd0dd1
+DIST mutt-wizard-0_pre20200430.tar.gz 32120 BLAKE2B
0afe766ae7f8640cb58afbc70901fb358d17b9ad844b0d4a05e91d7be4d93847f2e4cc34eef690d2e905cebcb17ebe21cfee4beefc971e09dca2129ab5d349d6
SHA512
b8008e8c804da6d30be55790fe7b1a511671f93629527a9f7062d8c1865c4267a282c5ac9719367671d99a76aa29b8bd3ed05fad6d3ec2939a659ca38c558c51
diff --git a/mail-client/mutt-wizard/mutt-wizard-0_pre20200412.ebuild
b/mail-client/mutt-wizard/mutt-wizard-0_pre20200430.ebuild
similarity index 93%
rename from mail-client/mutt-wizard/mutt-wizard-0_pre20200412.ebuild
rename to mail-client/mutt-wizard/mutt-wizard-0_pre20200430.ebuild
index d171f86..42d6fb3 100644
--- a/mail-client/mutt-wizard/mutt-wizard-0_pre20200412.ebuild
+++ b/mail-client/mutt-wizard/mutt-wizard-0_pre20200430.ebuild
@@ -6,7 +6,7 @@ EAPI=7
DESCRIPTION="A system for automatically configuring mutt and isync"
HOMEPAGE="https://github.com/LukeSmithxyz/mutt-wizard;
-COMMIT=7c980ec6fbc4e51f3fa663a541de4ff5a4f6587f
+COMMIT=069910c13ec1c89421372b8e54b40cd2ae783303
SRC_URI="https://github.com/LukeSmithxyz/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 25f0ba72654df8819eb8acd20c4a6940e3f84ad1 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Apr 30 20:20:11 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Apr 30 20:22:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f0ba72 profiles: mask x11-plugins/fsviewer for removal Signed-off-by: Bernard Cafarelli gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index e19f8dcf59e..3323ecc31f5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Bernard Cafarelli (2020-04-30) +# Does not compile with latest windowmaker, bug #717418 +# Last release in 2007. Masked for removal in 30 days. +x11-plugins/fsviewer + # Bernard Cafarelli (2020-04-30) # Does not compile with latest windowmaker, bug #716890 # Last release in 2007. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: dev-python/nltk/
commit: 05ef2cfc833c5f46db539bed78621a552ec97ce6
Author: Jason A. Donenfeld gentoo org>
AuthorDate: Thu Apr 30 20:21:40 2020 +
Commit: Jason A. Donenfeld gentoo org>
CommitDate: Thu Apr 30 20:22:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05ef2cfc
dev-python/nltk: add missing dependencies
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jason A. Donenfeld gentoo.org>
dev-python/nltk/nltk-3.5.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index c01b3203dde..754de8ce173 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -18,7 +18,11 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~x86-solaris"
IUSE="tk"
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/joblib[${PYTHON_USEDEP}]
+ dev-python/regex[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
BDEPEND="
test? (
dev-python/joblib[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: app-text/xpdf/
commit: f2e97d26d315297c9014abc9e6c1fd3d5aa4f44a
Author: Andrew Savchenko gentoo org>
AuthorDate: Thu Apr 30 20:17:39 2020 +
Commit: Andrew Savchenko gentoo org>
CommitDate: Thu Apr 30 20:19:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e97d26
app-text/xpdf: drop old
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andrew Savchenko gentoo.org>
app-text/xpdf/xpdf-4.02-r2.ebuild | 141 --
1 file changed, 141 deletions(-)
diff --git a/app-text/xpdf/xpdf-4.02-r2.ebuild
b/app-text/xpdf/xpdf-4.02-r2.ebuild
deleted file mode 100644
index c942b87ba90..000
--- a/app-text/xpdf/xpdf-4.02-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop xdg
-
-DESCRIPTION="The PDF viewer and tools"
-HOMEPAGE="https://www.xpdfreader.com;
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
- i18n? (
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-
https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
- https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
- )"
-
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cmyk cups i18n icons +libpaper metric opi png +textselect utils"
-
-BDEPEND="
- icons? ( media-gfx/inkscape )
-"
-DEPEND="
- cups? (
- dev-qt/qtprintsupport:5
- net-print/cups
- )
- libpaper? ( app-text/libpaper )
- utils? ( png? ( media-libs/libpng:0 ) )
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- media-libs/freetype
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}
- media-fonts/urw-fonts
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-automagic.patch
- "${FILESDIR}"/${PN}-visibility.patch
- "${FILESDIR}"/${PN}-shared-libs.patch
- "${FILESDIR}"/${PN}-CVE-2019-17064.patch
-)
-
-src_prepare() {
- sed -i \
- "s|/usr/local/etc|${EPREFIX}/etc|;
-s|/usr/local|${EPREFIX}/usr|" \
- doc/sample-xpdfrc || die
-
- if use i18n; then
- sed -i "s|/usr/local|${EPREFIX}/usr|"
"${WORKDIR}"/*/add-to-xpdfrc || die
- fi
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DA4_PAPER=$(usex metric)
- -DNO_TEXT_SELECT=$(usex textselect off on)
- -DOPI_SUPPORT=$(usex opi)
- -DSPLASH_CMYK=$(usex cmyk)
- -DWITH_LIBPAPER=$(usex libpaper)
- -DWITH_LIBPNG=$(usex png)
- -DXPDFWIDGET_PRINTING=$(usex cups)
- -DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use icons; then
- sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
- cd xpdf-qt
- mkdir $sizes
- local i
- for i in $sizes; do
- inkscape xpdf-icon.svg -w $i -h $i -e $i/xpdf.png
- done
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- domenu "${FILESDIR}/xpdf.desktop"
- newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
- if use icons; then
- local i
- for i in $sizes; do
- doicon -s $i xpdf-qt/$i/xpdf.png
- done
- unset sizes
- fi
-
- insinto /etc
- newins doc/sample-xpdfrc xpdfrc
-
- local d i
- if use utils; then
- for d in "bin" "share/man/man1"; do
- pushd "${ED}/usr/${d}" || die
- for i in pdf*; do
- mv "${i}" "x${i}" || die
- done
- popd || die
- done
-
- einfo "PDF utilities were renamed from pdf* to xpdf* to avoid
file collisions"
- einfo "with other packages"
- else
- rm -rf "${ED}"/usr/bin/pdf* \
- "${ED}"/usr/share/man/man1/pdf* \
- "${ED}"/usr/$(get_libdir) || die
- fi
-
- if use i18n; then
- for i
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: e0adaa6f46a10220727728ee2a9931be82e356ab Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Apr 30 20:11:11 2020 + Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Apr 30 20:11:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0adaa6f profiles: mask x11-misc/wmakerconf for removal Signed-off-by: Bernard Cafarelli gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 5152e304c81..e19f8dcf59e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Bernard Cafarelli (2020-04-30) +# Does not compile with latest windowmaker, bug #716890 +# Last release in 2007. Masked for removal in 30 days. +x11-misc/wmakerconf + # Andreas Sturmlechner (2020-04-30) # Py3 porting "not in the near future", bug #708152 # Stuck on Python 2 and pygtk. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/
commit: a11d4198235deeb6ac5f917b7b426412a39c7607
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 19:56:08 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 20:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11d4198
media-plugins/audacious-plugins: 4.0.3 version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-plugins/audacious-plugins/Manifest | 1 +
.../audacious-plugins-4.0.3.ebuild | 166 +
2 files changed, 167 insertions(+)
diff --git a/media-plugins/audacious-plugins/Manifest
b/media-plugins/audacious-plugins/Manifest
index cf8fadc2da9..64b9474664e 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,2 +1,3 @@
DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B
fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3
SHA512
454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
DIST audacious-plugins-4.0.2.tar.bz2 1752042 BLAKE2B
73a7c72517e1f897885d0d73797e0b47fe4c25625f317dd6ea6179de997d10f2e6b829bc35411794c1b526eb671e07220bc7056214668d2cd5b53d2e754a7041
SHA512
0d3aa46f6ad75e6d541de7b7f24de2cc169a8856c5a204688231b6233131a1ce55feb9bb126eed89d05a8ee21e3a441449a1e11fd20b4fc10724afebb4318118
+DIST audacious-plugins-4.0.3.tar.bz2 1759123 BLAKE2B
7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b
SHA512
6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
new file mode 100644
index 000..a911f9f7c86
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.3.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == * ]]; then
+ inherit autotools git-r3
+
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git;
+else
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2;
+ KEYWORDS="~amd64 ~x86"
+fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/;
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+ lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
+ pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
+ vorbis wavpack"
+REQUIRED_USE="
+ || ( alsa jack pulseaudio qtmedia sdl )
+ ampache? ( http ) streamtuner? ( http )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+# alarm
+# albumart
+# delete-files
+# ladspa
+# playlist-manager
+# search-tool
+# skins
+# vtx
+# Plugins with a configure option:
+# glspectrum
+# gtkui
+# hotkey
+# notify
+# statusicon
+BDEPEND="
+ dev-util/gdbus-codegen
+ virtual/pkgconfig
+ nls? ( dev-util/intltool )
+"
+DEPEND="
+ app-arch/unzip
+ dev-libs/dbus-glib
+ dev-libs/glib
+ dev-libs/libxml2:2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ ~media-sound/audacious-${PV}
+ aac? ( >=media-libs/faad2-2.7 )
+ alsa? ( >=media-libs/alsa-lib-1.0.16 )
+ ampache? ( =media-libs/ampache_browser-1* )
+ bs2b? ( media-libs/libbs2b )
+ cdda? (
+ dev-libs/libcdio:=
+ dev-libs/libcdio-paranoia:=
+ >=media-libs/libcddb-1.2.1
+ )
+ cue? ( media-libs/libcue:= )
+ ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
+ flac? (
+ >=media-libs/flac-1.2.1-r1
+ >=media-libs/libvorbis-1.0
+ )
+ fluidsynth? ( media-sound/fluidsynth:= )
+ http? ( >=net-libs/neon-0.26.4 )
+ jack? (
+ >=media-libs/bio2jack-0.4
+ virtual/jack
+ )
+ lame? ( media-sound/lame )
+ libnotify? ( x11-libs/libnotify )
+ libsamplerate? ( media-libs/libsamplerate:= )
+ lirc? ( app-misc/lirc )
+ mms? ( >=media-libs/libmms-0.3 )
+ modplug? ( media-libs/libmodplug )
+ mp3? ( >=media-sound/mpg123-1.12.1 )
+ opengl? ( dev-qt/qtopengl:5 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+ qtmedia? ( dev-qt/qtmultimedia:5 )
+ scrobbler? ( net-misc/curl )
+ sdl? ( media-libs/libsdl2[sound] )
+
[gentoo-commits] repo/gentoo:master commit in: dev-libs/flatbuffers/
commit: f4f7d3551df2b05ff61293e43119f125fa7479be
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 19:46:07 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 20:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4f7d355
dev-libs/flatbuffers: Drop 1.11.0
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-libs/flatbuffers/Manifest | 1 -
dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild | 30 --
2 files changed, 31 deletions(-)
diff --git a/dev-libs/flatbuffers/Manifest b/dev-libs/flatbuffers/Manifest
index 07e8576fac8..61fd59662dd 100644
--- a/dev-libs/flatbuffers/Manifest
+++ b/dev-libs/flatbuffers/Manifest
@@ -1,2 +1 @@
-DIST flatbuffers-1.11.0.tar.gz 894944 BLAKE2B
8eee7165f2dfbed6ee0b0cfbec0df995bc6e8a19600ad42ac70788714635ba90d72f2dc24d0e1edd5ac6a1cf6148948f625245d3079e75861d29117f6fcf34fd
SHA512
cbb2e1e6885255cc950e2fa8248b56a8bc2c6e52f6fc7ed9066e6ae5a1d53f1263594b83f4b944a672cf9d0e1e800e51ce7fa423eff45abf5056269879c286fe
DIST flatbuffers-1.12.0.tar.gz 1145348 BLAKE2B
441123be124ad851efa30bda0d828a764ebaf79ba6692a6e5904000b33818e9de78c3a964037ac93ef562890980c58169141e55354dce86857c02bcd917150d6
SHA512
8a0b88d739fa4694a69d3630140fe89fdd70d50bba4dadd1758d9aa2920cda16700bcafb8d89fe2a09ac907d3f378240c3cb4abc7106318136799836aba4b063
diff --git a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
b/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
deleted file mode 100644
index 9f8719c337c..000
--- a/dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Memory efficient serialization library"
-HOMEPAGE="https://google.github.io/flatbuffers/;
-SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-DOCS=( readme.md )
-
-src_configure() {
- local mycmakeargs=(
- -DFLATBUFFERS_BUILD_FLATLIB=$(usex static-libs)
- -DFLATBUFFERS_BUILD_SHAREDLIB=ON
- -DFLATBUFFERS_BUILD_TESTS=$(usex test)
- )
-
- use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
-
- cmake_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/
commit: 936c1a9948b01172367a06e4f5758636dd6426ce
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 20:01:11 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 20:02:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936c1a99
media-plugins/audacious-plugins: Drop 4.0.2-r1
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-plugins/audacious-plugins/Manifest | 1 -
.../audacious-plugins-4.0.2-r1.ebuild | 166 -
2 files changed, 167 deletions(-)
diff --git a/media-plugins/audacious-plugins/Manifest
b/media-plugins/audacious-plugins/Manifest
index 64b9474664e..e94486fe61e 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,3 +1,2 @@
DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B
fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3
SHA512
454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
-DIST audacious-plugins-4.0.2.tar.bz2 1752042 BLAKE2B
73a7c72517e1f897885d0d73797e0b47fe4c25625f317dd6ea6179de997d10f2e6b829bc35411794c1b526eb671e07220bc7056214668d2cd5b53d2e754a7041
SHA512
0d3aa46f6ad75e6d541de7b7f24de2cc169a8856c5a204688231b6233131a1ce55feb9bb126eed89d05a8ee21e3a441449a1e11fd20b4fc10724afebb4318118
DIST audacious-plugins-4.0.3.tar.bz2 1759123 BLAKE2B
7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b
SHA512
6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.2-r1.ebuild
b/media-plugins/audacious-plugins/audacious-plugins-4.0.2-r1.ebuild
deleted file mode 100644
index a911f9f7c86..000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == * ]]; then
- inherit autotools git-r3
-
EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git;
-else
- SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2;
- KEYWORDS="~amd64 ~x86"
-fi
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/;
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
- lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
- pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
- vorbis wavpack"
-REQUIRED_USE="
- || ( alsa jack pulseaudio qtmedia sdl )
- ampache? ( http ) streamtuner? ( http )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-# alarm
-# albumart
-# delete-files
-# ladspa
-# playlist-manager
-# search-tool
-# skins
-# vtx
-# Plugins with a configure option:
-# glspectrum
-# gtkui
-# hotkey
-# notify
-# statusicon
-BDEPEND="
- dev-util/gdbus-codegen
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-DEPEND="
- app-arch/unzip
- dev-libs/dbus-glib
- dev-libs/glib
- dev-libs/libxml2:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- ~media-sound/audacious-${PV}
- aac? ( >=media-libs/faad2-2.7 )
- alsa? ( >=media-libs/alsa-lib-1.0.16 )
- ampache? ( =media-libs/ampache_browser-1* )
- bs2b? ( media-libs/libbs2b )
- cdda? (
- dev-libs/libcdio:=
- dev-libs/libcdio-paranoia:=
- >=media-libs/libcddb-1.2.1
- )
- cue? ( media-libs/libcue:= )
- ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
- flac? (
- >=media-libs/flac-1.2.1-r1
- >=media-libs/libvorbis-1.0
- )
- fluidsynth? ( media-sound/fluidsynth:= )
- http? ( >=net-libs/neon-0.26.4 )
- jack? (
- >=media-libs/bio2jack-0.4
- virtual/jack
- )
- lame? ( media-sound/lame )
- libnotify? ( x11-libs/libnotify )
- libsamplerate? ( media-libs/libsamplerate:= )
- lirc? ( app-misc/lirc )
- mms? ( >=media-libs/libmms-0.3 )
- modplug? ( media-libs/libmodplug )
- mp3? ( >=media-sound/mpg123-1.12.1 )
- opengl? ( dev-qt/qtopengl:5 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
- qtmedia? ( dev-qt/qtmultimedia:5 )
- scrobbler? ( net-misc/curl )
- sdl? ( media-libs/libsdl2[sound] )
-
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/
commit: 674e200597bc6f5693d09362d96118ae3cc1410c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 19:55:48 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 20:02:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674e2005
media-sound/audacious: 4.0.3 version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/audacious/Manifest | 1 +
media-sound/audacious/audacious-4.0.3.ebuild | 81
2 files changed, 82 insertions(+)
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index bd17b50f854..3af5c6dd52e 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,3 +1,4 @@
DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B
d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b
SHA512
e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
DIST audacious-4.0.2.tar.bz2 576407 BLAKE2B
001d185db59e38f686c78964b759f851481bc4c7fcddb521fde9bd985095fa32bacb6f1bcea167a91616af4fca412d75cf63dfe0cd3b19ee396e36e211b1a94e
SHA512
3f541000c874f2d026f2a4c23f1f98486aae9450c6dc8d7597f742b21d701883b31bbc5620bf23408ce0da397fdf414dffe37a778eb70df5a553a854f2435b99
+DIST audacious-4.0.3.tar.bz2 577512 BLAKE2B
55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18
SHA512
e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd
DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B
d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54
SHA512
e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
diff --git a/media-sound/audacious/audacious-4.0.3.ebuild
b/media-sound/audacious/audacious-4.0.3.ebuild
new file mode 100644
index 000..13924b39fcb
--- /dev/null
+++ b/media-sound/audacious/audacious-4.0.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == * ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git;
+else
+ SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2;
+ KEYWORDS="~amd64 ~x86"
+fi
+inherit xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/;
+SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( dev-util/intltool )
+"
+DEPEND="
+ >=dev-libs/dbus-glib-0.60
+ >=dev-libs/glib-2.28
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ >=x11-libs/cairo-1.2.6
+ >=x11-libs/pango-1.8.0
+ virtual/freedesktop-icon-theme
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ default
+ [[ ${PV} == * ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+ default
+ if ! use nls; then
+ sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+ fi
+ [[ ${PV} == * ]] && eautoreconf
+}
+
+src_configure() {
+ # D-Bus is a mandatory dependency, remote control,
+ # session management and some plugins depend on this.
+ # Building without D-Bus is *unsupported* and a USE-flag
+ # will not be added due to the bug reports that will result.
+ # Bugs #197894, #199069, #207330, #208606
+ local myeconfargs=(
+ --disable-valgrind
+ --disable-gtk
+ --enable-dbus
+ --enable-qt
+ $(use_enable nls)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # Gentoo_ice skin installation; bug #109772
+ insinto /usr/share/audacious/Skins/gentoo_ice
+ doins -r "${WORKDIR}"/gentoo_ice/.
+ docinto gentoo_ice
+ dodoc "${WORKDIR}"/README
+}
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacious/
commit: ab138e3db7a3b1d7f8045fff335edeffd6b2ec75
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 20:01:39 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 20:02:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab138e3d
media-sound/audacious: Drop 4.0.2
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-sound/audacious/Manifest | 1 -
media-sound/audacious/audacious-4.0.2.ebuild | 81
2 files changed, 82 deletions(-)
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index 3af5c6dd52e..be7a72b9134 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,4 +1,3 @@
DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B
d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b
SHA512
e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
-DIST audacious-4.0.2.tar.bz2 576407 BLAKE2B
001d185db59e38f686c78964b759f851481bc4c7fcddb521fde9bd985095fa32bacb6f1bcea167a91616af4fca412d75cf63dfe0cd3b19ee396e36e211b1a94e
SHA512
3f541000c874f2d026f2a4c23f1f98486aae9450c6dc8d7597f742b21d701883b31bbc5620bf23408ce0da397fdf414dffe37a778eb70df5a553a854f2435b99
DIST audacious-4.0.3.tar.bz2 577512 BLAKE2B
55d660398330a4b15c9074f7ac4c4b4ed50e550d7b7481f0e21d02fa9e1a73da175ded8ab65b0e112aee8bc62a8c817f6c5a8e75ef16c88a9f4193d94e2d8a18
SHA512
e09ae26f43d7a6b610df9ece90f77b912b98c5e4e9a3b5168df26e177ffac3f66a74bff503f398c271228198467c7b3b6797d1671979559c4e1cfb13b12549cd
DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B
d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54
SHA512
e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
diff --git a/media-sound/audacious/audacious-4.0.2.ebuild
b/media-sound/audacious/audacious-4.0.2.ebuild
deleted file mode 100644
index 13924b39fcb..000
--- a/media-sound/audacious/audacious-4.0.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == * ]]; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git;
-else
- SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2;
- KEYWORDS="~amd64 ~x86"
-fi
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/;
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
- virtual/pkgconfig
- nls? ( dev-util/intltool )
-"
-DEPEND="
- >=dev-libs/dbus-glib-0.60
- >=dev-libs/glib-2.28
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- >=x11-libs/cairo-1.2.6
- >=x11-libs/pango-1.8.0
- virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- default
- [[ ${PV} == * ]] && git-r3_src_unpack
-}
-
-src_prepare() {
- default
- if ! use nls; then
- sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
- fi
- [[ ${PV} == * ]] && eautoreconf
-}
-
-src_configure() {
- # D-Bus is a mandatory dependency, remote control,
- # session management and some plugins depend on this.
- # Building without D-Bus is *unsupported* and a USE-flag
- # will not be added due to the bug reports that will result.
- # Bugs #197894, #199069, #207330, #208606
- local myeconfargs=(
- --disable-valgrind
- --disable-gtk
- --enable-dbus
- --enable-qt
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # Gentoo_ice skin installation; bug #109772
- insinto /usr/share/audacious/Skins/gentoo_ice
- doins -r "${WORKDIR}"/gentoo_ice/.
- docinto gentoo_ice
- dodoc "${WORKDIR}"/README
-}
[gentoo-commits] repo/proj/guru:dev commit in: dev-python/ufoNormalizer/
commit: c1fc2db3e08706ec4bccb0d3ab2baa770a94867f
Author: Alessandro Barbieri gmail com>
AuthorDate: Thu Apr 30 18:54:08 2020 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 30 19:17:22 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c1fc2db3
dev-python/ufoNormalizer: new package
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri gmail.com>
dev-python/ufoNormalizer/Manifest | 1 +
dev-python/ufoNormalizer/metadata.xml | 26 +
.../ufoNormalizer/ufoNormalizer-0.4.1.ebuild | 27 ++
3 files changed, 54 insertions(+)
diff --git a/dev-python/ufoNormalizer/Manifest
b/dev-python/ufoNormalizer/Manifest
new file mode 100644
index 000..2297f4d
--- /dev/null
+++ b/dev-python/ufoNormalizer/Manifest
@@ -0,0 +1 @@
+DIST ufoNormalizer-0.4.1.tar.gz 30350 BLAKE2B
b5709deea451f28a4372cefca497dcde5875a6fd64afc5b21e8a115d02ed4ade714e6b5b3d2f445d4de70ba47a3a8dd9ed4e1e0c3e27f9ed6e7eb9f1994db134
SHA512
bf8cb37b171363e1eca85ba01f78f8c2ed4d7741aba3ca8b77c1590fc81cca194d521224f370cdadcda033772d2e5c540d04098558a148d44c747af20f4b636b
diff --git a/dev-python/ufoNormalizer/metadata.xml
b/dev-python/ufoNormalizer/metadata.xml
new file mode 100644
index 000..4cba23f
--- /dev/null
+++ b/dev-python/ufoNormalizer/metadata.xml
@@ -0,0 +1,26 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+
https://github.com/unified-font-object/ufoNormalizer/issues
+
+ t...@typesupply.com
+ Tal Leming
+
+ufonormalizer
+unified-font-object/ufoNormalizer
+
+
+Provides a standard formatting so that there are meaningful diffs in version
control rather than formatting noise.
+
+Examples of formatting applied by ufoNormalizer include:
+
+Changing floating-point numbers to integers where it doesn't alter the
value (e.g. x="95.0" becomes x="95" )
+Rounding floating-point numbers to 10 digits
+Formatting XML with tabs rather than spaces
+
+
diff --git a/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
b/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
new file mode 100644
index 000..2954c54
--- /dev/null
+++ b/dev-python/ufoNormalizer/ufoNormalizer-0.4.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A tool that will normalize the XML and other data inside of a
UFO."
+HOMEPAGE="https://github.com/unified-font-object/ufoNormalizer;
+SRC_URI="https://github.com/unified-font-object/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="app-arch/unzip"
+
+#python_test() {
+# "${EPYTHON}" esetup.py test || die
+#}
+
+distutils_enable_tests setup.py
[gentoo-commits] repo/proj/guru:dev commit in: media-libs/skia/
commit: 64def23e2b8cf1b4c810b6e2d95936f0c8bf803e
Author: Alessandro Barbieri gmail com>
AuthorDate: Wed Apr 29 14:47:50 2020 +
Commit: Alessandro Barbieri gmail com>
CommitDate: Thu Apr 30 19:17:22 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=64def23e
media-libs/skia: lift some restrictions
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri gmail.com>
media-libs/skia/skia-80_p20191220-r1.ebuild | 157
1 file changed, 157 insertions(+)
diff --git a/media-libs/skia/skia-80_p20191220-r1.ebuild
b/media-libs/skia/skia-80_p20191220-r1.ebuild
new file mode 100644
index 000..708bfe3
--- /dev/null
+++ b/media-libs/skia/skia-80_p20191220-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ninja-utils python-any-r1
+
+#https://github.com/google/skia/blob/master/include/core/SkMilestone.h
+COMMIT="1c9ebb50024f80f3bf289838298e15185d8f6966"
+
+SRC_URI="https://github.com/google/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+KEYWORDS="~amd64"
+DESCRIPTION="A complete 2D graphic library for drawing Text, Geometries, and
Images"
+HOMEPAGE="
+ https://skia.org
+ https://github.com/google/skia
+"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+#IUSE="dawn expat gif jpeg png pdf webp zlib"
+#TODO: find out how to enable and link: angle egl ffmpeg fontconfig freetype
gl harfbuzz heif icu lua opencl piex sfntly wuffs vulkan xps s
+
+#TODO: find out which deps are needed for gl/egl/vulkan/X/gif/xps
+# ffmpeg? ( virtual/ffmpeg )
+# heif? ( media-libs/libheif )
+# icu? ( dev-libs/icu )
+# virtual/opengl
+# lua? ( dev-lang/lua )
+# opencl? ( virtual/opencl )
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/expat
+ dev-libs/libbsd
+ dev-libs/libpcre
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz
+ media-libs/libglvnd
+ media-libs/libjpeg-turbo
+ media-libs/libpng
+ media-libs/libwebp
+ sys-apps/util-linux
+ sys-libs/zlib
+ x11-libs/libxcb
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+"
+DEPEND="
+ ${PYTHON_DEPS}
+ ${RDEPEND}
+"
+BDEPEND="
+ dev-util/gn
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+ default
+ # https://chromium.googlesource.com/chromium/src/third_party/zlib
+ # https://github.com/jtkukunas/zlib
+ sed \
+ -e '/:zlib_x86/d' \
+ -e '/third_party("zlib_x86/,/^}/d' \
+ -i third_party/zlib/BUILD.gn
+
+ #remove questionable cflags
+ sed -i 's|-O3||g' gn/BUILD.gn || die
+ sed -i 's|-ffunction-sections||g' gn/BUILD.gn || die
+ sed -i 's|-fdata-sections||g' gn/BUILD.gn || die
+}
+
+src_configure() {
+ python_setup
+ tc-export AR CC CXX
+
+ local myconf_gn=()
+ passflags() {
+ local _f _x
+ _f=( ${1} )
+ _x="[$(printf '"%s", ' "${_f[@]}")]"
+ myconf_gn+=( extra_${2}="${_x}" )
+ }
+ passflags "${CFLAGS}" cflags_c
+ passflags "${CXXFLAGS}" cflags_cc
+ passflags "${CFLAGS}" ldflags
+
+ myconf_gn+=(
+ ar=\"${AR}\"
+ cc=\"${CC}\"
+ cxx=\"${CXX}\"
+ is_component_build=true
+ is_official_build=true
+ skia_use_dng_sdk=false
+ skia_use_metal=false
+ skia_use_sfntly=false
+ )
+# skia_enable_pdf=$(usex pdf true false)
+#
+# skia_use_dawn=$(usex dawn true false)
+# skia_use_expat=$(usex expat true false)
+# skia_use_libgifcodec=$(usex gif true false)
+# skia_use_libjpeg_turbo_decode=$(usex jpeg true false)
+# skia_use_libjpeg_turbo_encode=$(usex jpeg true false)
+# skia_use_libpng_decode=$(usex png true false)
+# skia_use_libpng_encode=$(usex png true false)
+# skia_use_libwebp_decode=$(usex webp true false)
+# skia_use_libwebp_encode=$(usex webp true false)
+# skia_use_zlib=$(usex zlib true false)
+
+# skia_use_angle=$(usex angle true false)
+# skia_use_egl=$(usex egl true false)
+# skia_use_fontconfig=$(usex fontconfig true false)
+# skia_use_freetype=$(usex freetype true false)
+# skia_use_ffmpeg=$(usex ffmpeg true false)
+# skia_use_gl=$(usex gl true false)
+# skia_use_harfbuzz=$(usex harfbuzz true false)
+# skia_use_icu=$(usex icu true false)
+# skia_use_libheif=$(usex heif true false)
+# skia_use_lua=$(usex lua true false)
+# skia_use_opencl=$(usex opencl true false)
+#
[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/files/, app-admin/salt/
commit: f46a5f234c7ee1202d5b5dfd87ea5ad643f8eee8
Author: Patrick McLean sony com>
AuthorDate: Thu Apr 30 18:56:47 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Thu Apr 30 18:57:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46a5f23
app-admin/salt-3000.2-r3: revbump,pycrypto deps, fix warning (bug #720148)
Get rid of all pycrypto deps from requirements files, fix
collections.abc warning in bundled tornado.
Closes: https://bugs.gentoo.org/720148
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean gentoo.org>
app-admin/salt/files/salt-3000.2-tornado-py38.patch | 12
.../salt/{salt-3000.2-r2.ebuild => salt-3000.2-r3.ebuild}| 4
2 files changed, 16 insertions(+)
diff --git a/app-admin/salt/files/salt-3000.2-tornado-py38.patch
b/app-admin/salt/files/salt-3000.2-tornado-py38.patch
new file mode 100644
index 000..b324872c921
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.2-tornado-py38.patch
@@ -0,0 +1,12 @@
+diff -ur salt-3000.2.orig/salt/ext/tornado/httputil.py
salt-3000.2/salt/ext/tornado/httputil.py
+--- salt-3000.2.orig/salt/ext/tornado/httputil.py 2020-04-29
11:29:20.0 -0700
salt-3000.2/salt/ext/tornado/httputil.py 2020-04-30 11:52:45.690890947
-0700
+@@ -104,7 +104,7 @@
+ _normalized_headers = _NormalizedHeaderCache(1000)
+
+
+-class HTTPHeaders(collections.MutableMapping):
++class HTTPHeaders(collections.abc.MutableMapping):
+ """A dictionary that maintains ``Http-Header-Case`` for all keys.
+
+ Supports multiple values per key via a pair of new methods,
diff --git a/app-admin/salt/salt-3000.2-r2.ebuild
b/app-admin/salt/salt-3000.2-r3.ebuild
similarity index 96%
rename from app-admin/salt/salt-3000.2-r2.ebuild
rename to app-admin/salt/salt-3000.2-r3.ebuild
index 2f37c30a24d..5e7ab8e084a 100644
--- a/app-admin/salt/salt-3000.2-r2.ebuild
+++ b/app-admin/salt/salt-3000.2-r3.ebuild
@@ -111,6 +111,7 @@ PATCHES=(
# https://github.com/saltstack/salt/pull/55900
"${FILESDIR}/salt-3000.2-py38-abc.patch"
+ "${FILESDIR}/salt-3000.2-tornado-py38.patch"
)
python_prepare() {
@@ -122,6 +123,9 @@ python_prepare() {
# tests that require network access
rm tests/unit/{states,modules}/test_zcbuildout.py || die
+ # make sure pkg_resources doesn't bomb because pycrypto isn't installed
+ find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
+
# allow the use of the renamed msgpack
sed -i '/^msgpack/d' requirements/base.txt || die
}
[gentoo-commits] repo/gentoo:master commit in: dev-python/sphinxcontrib-websupport/
commit: 87207f3d1c69248e1090495d31e8e75566497dc3 Author: Michał Górny gentoo org> AuthorDate: Thu Apr 30 18:46:05 2020 + Commit: Michał Górny gentoo org> CommitDate: Thu Apr 30 18:47:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87207f3d dev-python/sphinxcontrib-websupport: Mark ALLARCHES Signed-off-by: Michał Górny gentoo.org> dev-python/sphinxcontrib-websupport/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/sphinxcontrib-websupport/metadata.xml b/dev-python/sphinxcontrib-websupport/metadata.xml index 1fd50daef80..4e20bc225c4 100644 --- a/dev-python/sphinxcontrib-websupport/metadata.xml +++ b/dev-python/sphinxcontrib-websupport/metadata.xml @@ -9,6 +9,7 @@ sphinxcontrib-webuspport provides a Python API to easily integrate Sphinx documentation into your Web application. + sphinxcontrib-websupport sphinx-doc/sphinxcontrib-websupport
[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/
commit: 00113e26e60349e8753ba7ca0642927e8ab8c96b
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Thu Apr 30 16:28:29 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 18:45:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00113e26
net-p2p/deluge: remove unused file
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15578
Signed-off-by: Andreas Sturmlechner gentoo.org>
net-p2p/deluge/files/deluge-web.service-2 | 11 ---
1 file changed, 11 deletions(-)
diff --git a/net-p2p/deluge/files/deluge-web.service-2
b/net-p2p/deluge/files/deluge-web.service-2
deleted file mode 100644
index adb38300a30..000
--- a/net-p2p/deluge/files/deluge-web.service-2
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Deluge WebUI
-Documentation=man:deluge-web
-After=deluged.service
-
-[Service]
-ExecStart=/usr/bin/deluge-web -c ${DELUGED_HOME} ${DELUGED_OPTS}
-
-[Install]
-WantedBy=multi-user.target
-
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 8d4f0a6ecbb64af4531fbe64ae504f2ab1a6d83e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 11:22:10 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 18:18:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4f0a6e app-laptop/batti: Mask for removal Maintainer did not answer. Bug: https://bugs.gentoo.org/708114 Signed-off-by: Andreas Sturmlechner gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index c5a8e00c53f..d25c6332859 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2020-04-30) +# Maintainer timeout, unmaintained upstream, last release in 2011, bug #708114 +# Stuck on Python 2 and pygtk. Masked for removal in 30 days. +app-laptop/batti + # Andreas Sturmlechner (2020-04-30) # Maintainer timeout, unmaintained upstream, last release in 2009, bug #708068 # Stuck on Python 2 and pygtk. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 40a51c86828f8cc33ae9ef54dadb2cf682c91f01 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 11:28:53 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 18:18:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a51c86 dev-embedded/pk2-la: Mask for removal Maintainer did not answer. Bug: https://bugs.gentoo.org/708128 Signed-off-by: Andreas Sturmlechner gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index c5892cca645..0eeb9d4bd15 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2020-04-30) +# Maintainer timeout, unmaintained upstream, last release in 2010, bug #708128 +# Stuck on Python 2 and pygtk. Masked for removal in 30 days. +dev-embedded/pk2-la + # Andreas Sturmlechner (2020-04-30) # Maintainer timeout, unmaintained upstream, last release unknown, bug #708122 # Stuck on Python 2 and pygtk. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 09fb5ff8d275b70b5e080d01f14f4dce0fabd4ec Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 11:38:25 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 18:19:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fb5ff8 net-firewall/ufw-frontends: Mask for removal Signed-off-by: Andreas Sturmlechner gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 20d526f0fb8..5152e304c81 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2020-04-30) +# Py3 porting "not in the near future", bug #708152 +# Stuck on Python 2 and pygtk. Masked for removal in 30 days. +net-firewall/ufw-frontends + # Andreas Sturmlechner (2020-04-30) # Maintainer timeout, unmaintained upstream, last release unknown, bug #708144 # Stuck on Python 2 and pygtk. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 2660475862a1a3d256990fdaf0347dfec4171e12 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Apr 30 11:24:49 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 30 18:18:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26604758 app-misc/metromap: Mask for removal Maintainer did not answer. Bug: https://bugs.gentoo.org/708122 Signed-off-by: Andreas Sturmlechner gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index d25c6332859..c5892cca645 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,11 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2020-04-30) +# Maintainer timeout, unmaintained upstream, last release unknown, bug #708122 +# Stuck on Python 2 and pygtk. Masked for removal in 30 days. +app-misc/metromap + # Andreas Sturmlechner (2020-04-30) # Maintainer timeout, unmaintained upstream, last release in 2011, bug #708114 # Stuck on Python 2 and pygtk. Masked for removal in 30 days.
[gentoo-commits] repo/gentoo:master commit in: app-i18n/tomoe/
commit: 838214d13e6868434543459f6ebc30c087a14388
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Apr 30 10:54:10 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 30 18:18:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838214d1
app-i18n/tomoe: Drop USE python
Bug: https://bugs.gentoo.org/695012
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-i18n/tomoe/tomoe-0.6.0-r6.ebuild | 78
1 file changed, 78 insertions(+)
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
new file mode 100644
index 000..4be2663f575
--- /dev/null
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby25 ruby26 ruby27"
+inherit autotools ruby-utils
+
+DESCRIPTION="Japanese handwriting recognition engine"
+HOMEPAGE="http://tomoe.osdn.jp/;
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="hyperestraier mysql ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs
subversion"
+REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2
+ hyperestraier? ( app-text/hyperestraier )
+ mysql? ( dev-db/mysql-connector-c:= )
+ ruby? (
+ $(for ruby in ${USE_RUBY}; do
+ echo "ruby_targets_${ruby}? (
+ $(_ruby_implementation_depend "${ruby}")
+ dev-ruby/ruby-glib2[ruby_targets_${ruby}]
+ )"
+ done)
+ )
+ subversion? ( dev-vcs/subversion )"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-gentoo.patch
+ "${FILESDIR}"/${PN}-export-symbols.patch
+ "${FILESDIR}"/${PN}-glib-2.32.patch
+ "${FILESDIR}"/${PN}-ruby19.patch
+)
+
+src_prepare() {
+ sed -i \
+ -e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
+ -e "s/use_mysql=yes/use_mysql=$(usex mysql)/" \
+ configure.ac
+
+ sed -i "s/use_svn=yes/use_svn=$(usex subversion)/" macros/svn.m4
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local ruby
+ for ruby in ${USE_RUBY}; do
+ if use ruby_targets_${ruby}; then
+ break
+ fi
+ done
+
+ econf \
+ $(use_enable ruby dict-ruby) \
+ $(use_enable static-libs static) \
+ --without-python \
+ $(use_with ruby ruby "$(type -P ${ruby})") \
+ --with-svn-include="${EPREFIX}"/usr/include \
+ --with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
