[gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/

2021-04-19 Thread Eray Aslan
commit: 6f4c3acb798a837d49d6ef19cd62eed6c652cd61
Author: Eray Aslan  gentoo  org>
AuthorDate: Tue Apr 20 05:46:59 2021 +
Commit: Eray Aslan  gentoo  org>
CommitDate: Tue Apr 20 05:46:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4c3acb

mail-mta/postfix: bump to 3.6_pre20210419

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Eray Aslan  gentoo.org>

 mail-mta/postfix/Manifest   | 2 +-
 .../{postfix-3.6_pre20210418.ebuild => postfix-3.6_pre20210419.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 6a65b872bf1..541de438ba9 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,4 @@
 DIST postfix-3.5.10.tar.gz 4621130 BLAKE2B 
32a0ef43131c1bff319fb8a159e78a4fd81aba85aa2c8aab3020d575e6216a1e5fb4612a4aa3693b62de5825a29bf5ea1c1870835f033569a5d2d3e494306ef1
 SHA512 
5845701d3dcdaaea376a44810a84dbe908e96e5ff54921cd40fd2d5c5643ed8e4add5936e149237fea4cb69c1ffb4ceb4171d1e779be096aa21a6e5021b604da
 DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 
13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc
 SHA512 
0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
 DIST postfix-3.5.9.tar.gz 4620852 BLAKE2B 
66a7bd71e7f74c8f25963ed8d41f04f1f95e060fd23c848065a0e947e766efe058e6593ed8ce1f69528f5b2e9868756d0ea0622b3d77486852882622dd3bb872
 SHA512 
9ff3a33cdd5811e470d5c6cfa896fa76e4d3257b139deec5f420d18e34232f327b7c8496c5d13566c6f9ae1fdf8719feb9981372b2869b0208a2eb3a1daaeadd
-DIST postfix-3.6-20210418.tar.gz 4735318 BLAKE2B 
ae1ff5da983df545db8122bb49abd4722365c793adde2a7af85bbf64f4c7fb36a60180a4fddeb28a838496f635e1834e49c1b36b6c5d7e4c6e0ce40027db7874
 SHA512 
e55507641052e1c123ac12382313f1a289e0e8e3739ddfbd0e06d764d3ffe093769276bdc3b93066e974ded06d89a3be3f713d4baa62792fe0de2b6c80e4a067
+DIST postfix-3.6-20210419.tar.gz 4735378 BLAKE2B 
ac92ef03b23aa01e35632f20c6459406d773a7275a2f2866e50b59faae104c573d524a045e57863f6e8892f82ff7a7d2ab5dd79e7fc7501647a73e6719a62629
 SHA512 
09be6aef3d3884b5a19418c6c390b546659a083510e5edf5130432dc4644d721269bfb7d98880b02ce65da1e72e71e539a4fdb8e488e8bfcc6dc639f861425d2

diff --git a/mail-mta/postfix/postfix-3.6_pre20210418.ebuild 
b/mail-mta/postfix/postfix-3.6_pre20210419.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.6_pre20210418.ebuild
rename to mail-mta/postfix/postfix-3.6_pre20210419.ebuild



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

2021-04-19 Thread Hans de Graaff
commit: 92f8e58837bd5af83d0d95d268ecb2b8506190f0
Author: Hans de Graaff  gentoo  org>
AuthorDate: Tue Apr 20 05:23:21 2021 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Tue Apr 20 05:23:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f8e588

dev-ruby/test-unit: add 3.4.1

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Hans de Graaff  gentoo.org>

 dev-ruby/test-unit/Manifest   |  1 +
 dev-ruby/test-unit/test-unit-3.4.1.ebuild | 33 +++
 2 files changed, 34 insertions(+)

diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 2397da573ca..c55e8e1a2d6 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -3,3 +3,4 @@ DIST test-unit-3.3.7.gem 121856 BLAKE2B 
507c9c538e89156d620b229e0144258def17975d
 DIST test-unit-3.3.8.gem 121856 BLAKE2B 
f47ef205c566fc404d7ffb9380502ae18224c395f65e3ab663472ec4874d0e77b0cb13a5ba80525965ff340c3941168773d6ceca6891036a8ec57bfcaa4ffbd8
 SHA512 
fba6a7ab4c87c07950498a372a21f888d87f1e1b0e5b49deb97aab4e2815fb85b979aa8afc6e8a6c4a9ad648371f1d9de968958350d0ecab10dfdd2bc0a2c112
 DIST test-unit-3.3.9.gem 121856 BLAKE2B 
f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f16e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c
 SHA512 
8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
 DIST test-unit-3.4.0.gem 121856 BLAKE2B 
ff975888027ba6122146f074926074ad7eb94e7fd442ab3d9f5d4f2eba83695e7f7ff2d17bd4578fa81caed5971170d0d8d287d8c87426dca63bf7ace1c7a850
 SHA512 
b7fd84165c956975f758b09c13d6d8f3a613e5d72c381cc3ee7522b5c6e1ad2751d8709bf1d45169823260769909ddaad487f51cdf68312b1e29c1d861f8107f
+DIST test-unit-3.4.1.gem 122368 BLAKE2B 
cb1677c83d11c0edbb6ad2eedda63f777832993d262ad0b1b5022fcc049d82d8eaf9284bad22f9a49f3d43febed6f72291eeb30d8844f3ef4703f93b9f556f7d
 SHA512 
08c5877cf6ae80e6ef5de7c806dac74405329cd08a97431d174b756ad173e727a536fe315a624c5e1d5b071d5b887cb4b8498675f5f54073bdffe9d5ec4eb745

diff --git a/dev-ruby/test-unit/test-unit-3.4.1.ebuild 
b/dev-ruby/test-unit/test-unit-3.4.1.ebuild
new file mode 100644
index 000..805bffe784a
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.4.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit;
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend "dev-ruby/power_assert"
+
+all_ruby_prepare() {
+   mv doc doc-install || die "moving doc directory out of the way failed"
+}
+
+each_ruby_test() {
+   ${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   newbin "${FILESDIR}"/testrb-3 testrb-2
+}



[gentoo-commits] repo/proj/guru:dev commit in: net-misc/myip/

2021-04-19 Thread Marco Sirabella
commit: d70a686ae5073e9db2744a14996552fd1f629078
Author: Marco Sirabella  sirabella  org>
AuthorDate: Tue Apr 20 03:51:52 2021 +
Commit: Marco Sirabella  sirabella  org>
CommitDate: Tue Apr 20 03:52:10 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d70a686a

net-misc/myip: Add new package

Signed-off-by: Marco Sirabella  sirabella.org>

 net-misc/myip/Manifest  |  5 +
 net-misc/myip/metadata.xml  | 16 
 net-misc/myip/myip-1.2.0.ebuild | 32 
 3 files changed, 53 insertions(+)

diff --git a/net-misc/myip/Manifest b/net-misc/myip/Manifest
new file mode 100644
index 0..2dba302d1
--- /dev/null
+++ b/net-misc/myip/Manifest
@@ -0,0 +1,5 @@
+DIST github.com%2F!snawoot%2Fextip%2F@v%2Fv1.0.0.mod 72 BLAKE2B 
bf71b172b963882ba2fcac7f11ff6c2493e5ebba316023f217873e47487231f425a699fcd2c2d18a35a382099a632e685366cf7e65294b0ed5bf78706b0c
 SHA512 
73120a6555cf7d77c9e8ac03f8029d79a7dcd8d98794bd51137d3c3bb3aea32fa6a3d7e1703b1c86d73b30941da8e6c5e385fb5470884081817ccf201c72f49f
+DIST github.com%2F!snawoot%2Fextip%2F@v%2Fv1.0.0.zip 3841 BLAKE2B 
fd477585925a3581cc00bef085ae147ecb95908072c33355e6be2f2b00c8b0c15b473043b9b00918242c97a725c9a13b6d04f86847937f6bb47eff2c009492ed
 SHA512 
9e09d53ceaf903cdd374f0b8eb8d59457c7e76555b5ee682c3562560e3f9a4250db311738539d759e2fb7605f6f72b7289234bb26ec5c8b2dd88f2e1ed5f7258
+DIST gortc.io%2Fstun%2F@v%2Fv1.22.2.mod 30 BLAKE2B 
ebe4c3ce49779332e6622a802eebc7533873a76e7a8f4ff0949dda910f3a89aaf4d0c1923503e976ae45d9fe11eaaa9d9d1bccbb6746fa011e85cd74fe1e003e
 SHA512 
b2dfe24c7e28b9430b503908a877ee2e39223604aad87f433ae240bc8479e89dbd35a3aec422fe1280e111fdace3b2064586ab688f5561954b924d17cb070e4a
+DIST gortc.io%2Fstun%2F@v%2Fv1.22.2.zip 113037 BLAKE2B 
af5e80d5a058a5b3dcdc87ba772028475339d676f10d84c6f97fb740e7b34c0bf82028eaec707fcbb42ac7e682609421df4a3b055778c4ae8e97d5200ad88a13
 SHA512 
434affee0b63952297d77a31b7a285c4313023a3d39d139b8153144394c45be7d702e9b1f614a44831195e671a12fc226c4a95c0293f109baee58071ee17b5fa
+DIST myip-1.2.0.tar.gz 3461 BLAKE2B 
8d08789f5a2fbbd59a8bc0c9f98227f4779f7f66bf039d4b6e0e166e073f22c08dd7a29626e634cf01f93e2c5842266c74d21a60fb8c91f8e79974ec4555fdd3
 SHA512 
e16c8d3a4bab39ec350ba0d38a9ba4598c4d44a0510bfc233542701c49fd1f33ab6ec2345795cc6dcdda426027dee1bc59085b29d7f9cb1899892276ed40eb12

diff --git a/net-misc/myip/metadata.xml b/net-misc/myip/metadata.xml
new file mode 100644
index 0..8c546d2a8
--- /dev/null
+++ b/net-misc/myip/metadata.xml
@@ -0,0 +1,16 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ma...@sirabella.org
+   Marco Sirabella
+   
+   
+   Snawoot/myip
+   https://github.com/Snawoot/myip/issues
+   https://git.vuxu.org/nq/plain/NEWS.md
+   
+   
+   Reliably and quickly get your external IP address from public 
STUN servers. Program issues parallel queries to public STUN servers to 
determine public IP address and returns result as soon as quorum of matching 
responses reached.
+   
+

diff --git a/net-misc/myip/myip-1.2.0.ebuild b/net-misc/myip/myip-1.2.0.ebuild
new file mode 100644
index 0..c3d4bb6bc
--- /dev/null
+++ b/net-misc/myip/myip-1.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+EGO_SUM=(
+   "github.com/Snawoot/extip v1.0.0/go.mod"
+   "github.com/Snawoot/extip v1.0.0"
+   "gortc.io/stun v1.22.2/go.mod"
+   "gortc.io/stun v1.22.2"
+)
+go-module_set_globals
+
+DESCRIPTION="Get your external IP address using STUN server"
+HOMEPAGE="https://github.com/Snawoot/myip;
+EGO_PN="github.com/Snawoot/${PN}"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_install() {
+   dobin bin/*
+}



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/

2021-04-19 Thread Patrick McLean
commit: 816074b07b21e36ccfddd5df66c76277ea122c15
Author: Patrick McLean  gentoo  org>
AuthorDate: Tue Apr 20 03:30:38 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Tue Apr 20 03:30:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=816074b0

dev-util/bpftrace-0.12.1: Fix leftover usex check

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 dev-util/bpftrace/bpftrace-0.12.1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild 
b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
index cd944547539..c36af3ddcf9 100644
--- a/dev-util/bpftrace/bpftrace-0.12.1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
@@ -82,7 +82,6 @@ src_configure() {
-DSTATIC_LINKING:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DBUILD_FUZZ:BOOL=$(usex fuzzing)
-   -DUSE_LIBFUZZER:BOOL=$(usex libfuzzer)
)
 
cmake_src_configure



[gentoo-commits] repo/gentoo:master commit in: dev-cpp/glibmm/

2021-04-19 Thread Matt Turner
commit: f3c9dcf33917c197e7ac763ed3ca731a5581644b
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:47:06 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:47:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c9dcf3

dev-cpp/glibmm: use ${EPYTHON}, not python3

Closes: https://bugs.gentoo.org/762928
Signed-off-by: Matt Turner  gentoo.org>

 dev-cpp/glibmm/glibmm-2.64.5.ebuild | 4 +++-
 dev-cpp/glibmm/glibmm-2.68.0.ebuild | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-cpp/glibmm/glibmm-2.64.5.ebuild 
b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
index db0034cef75..25300c2afb5 100644
--- a/dev-cpp/glibmm/glibmm-2.64.5.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.64.5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="https://www.gtkmm.org;
@@ -19,6 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+   ${PYTHON_DEPS}
virtual/pkgconfig
>=dev-cpp/mm-common-1.0.0
sys-devel/m4

diff --git a/dev-cpp/glibmm/glibmm-2.68.0.ebuild 
b/dev-cpp/glibmm/glibmm-2.68.0.ebuild
index 16c2ce0ff99..2cf6d1781f5 100644
--- a/dev-cpp/glibmm/glibmm-2.68.0.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.68.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org meson multilib-minimal
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org meson multilib-minimal python-any-r1
 
 DESCRIPTION="C++ interface for glib2"
 HOMEPAGE="https://www.gtkmm.org;
@@ -19,6 +20,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+   ${PYTHON_DEPS}
virtual/pkgconfig
doc? (
app-doc/doxygen[dot]



[gentoo-commits] repo/gentoo:master commit in: games-board/tali/

2021-04-19 Thread Matt Turner
commit: 0c7b27fb1066a3b7c20714406c21727d59325bff
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:34:52 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:34:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7b27fb

games-board/tali: use ${EPYTHON}, not python3

Also fix DEPEND -> BDEPEND typo.

Closes: https://bugs.gentoo.org/778854
Signed-off-by: Matt Turner  gentoo.org>

 games-board/tali/tali-40.0.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-board/tali/tali-40.0.ebuild 
b/games-board/tali/tali-40.0.ebuild
index 1fb49b46a61..e7d48dcfafe 100644
--- a/games-board/tali/tali-40.0.ebuild
+++ b/games-board/tali/tali-40.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
 
 DESCRIPTION="Beat the odds in a poker-style dice game"
 HOMEPAGE="https://wiki.gnome.org/Apps/Tali;
@@ -10,7 +11,6 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali;
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
 
 DEPEND="
dev-libs/glib:2
@@ -20,7 +20,8 @@ DEPEND="
 RDEPEND="${DEPEND}
>=gnome-base/librsvg-2.32:2
 "
-DEPEND="
+BDEPEND="
+   ${PYTHON_DEPS}
dev-libs/appstream-glib
dev-util/itstool
>=sys-devel/gettext-0.19.8



[gentoo-commits] repo/gentoo:master commit in: games-board/gnome-mines/

2021-04-19 Thread Matt Turner
commit: 3caab8745cd5507372180df9beaf689058f7b69c
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:36:50 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:37:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3caab874

games-board/gnome-mines: use ${EPYTHON}, not python3

Closes: https://bugs.gentoo.org/778848
Signed-off-by: Matt Turner  gentoo.org>

 games-board/gnome-mines/gnome-mines-40.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-board/gnome-mines/gnome-mines-40.0.ebuild 
b/games-board/gnome-mines/gnome-mines-40.0.ebuild
index 8eefbf38697..547c48b85e1 100644
--- a/games-board/gnome-mines/gnome-mines-40.0.ebuild
+++ b/games-board/gnome-mines/gnome-mines-40.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson vala xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Clear hidden mines from a minefield"
 HOMEPAGE="https://wiki.gnome.org/Apps/Mines;
@@ -10,7 +11,6 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines;
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
 
 RDEPEND="
>=dev-libs/glib-2.40:2
@@ -21,6 +21,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+   ${PYTHON_DEPS}
$(vala_depend)
dev-libs/appstream-glib
dev-libs/libxml2:2



[gentoo-commits] repo/gentoo:master commit in: app-arch/file-roller/

2021-04-19 Thread Matt Turner
commit: 9ed54c79856c79565fc11d5a544c5cc6106a9459
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:44:19 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:44:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ed54c79

app-arch/file-roller: use ${EPYTHON}, not python3

Closes: https://bugs.gentoo.org/765829
Signed-off-by: Matt Turner  gentoo.org>

 app-arch/file-roller/file-roller-3.38.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app-arch/file-roller/file-roller-3.38.1.ebuild 
b/app-arch/file-roller/file-roller-3.38.1.ebuild
index 583372f4095..f7ba9f11727 100644
--- a/app-arch/file-roller/file-roller-3.38.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.38.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller;
@@ -28,6 +29,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+   ${PYTHON_DEPS}
dev-util/glib-utils
dev-util/itstool
>=sys-devel/gettext-0.19.8



[gentoo-commits] repo/gentoo:master commit in: games-puzzle/gnome-sudoku/

2021-04-19 Thread Matt Turner
commit: 71fcdc0ec2158b9e1f82c2a726054ebb23a767f9
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:38:03 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:38:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fcdc0e

games-puzzle/gnome-sudoku: use ${EPYTHON}, not python3

Closes: https://bugs.gentoo.org/778842
Signed-off-by: Matt Turner  gentoo.org>

 games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild 
b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
index 32bf1bb1dea..693d2558f9b 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-40.0.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
 
-inherit gnome.org gnome2-utils meson vala xdg
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Test your logic skills in this number grid puzzle"
 HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku;
@@ -12,7 +13,6 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku;
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
 
 RDEPEND="
>=dev-libs/glib-2.40:2
@@ -25,6 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+   ${PYTHON_DEPS}
$(vala_depend)
dev-libs/appstream-glib
dev-util/itstool



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

2021-04-19 Thread Matt Turner
commit: b6fab5d1ae37f5aaf17431ffc99f52be0264ee14
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:42:49 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:42:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6fab5d1

x11-libs/goocanvas: use ${EPYTHON}, not python3

Closes: https://bugs.gentoo.org/767289
Signed-off-by: Matt Turner  gentoo.org>

 x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild 
b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
index 81583d0cb59..4560a2d0c3c 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
-inherit gnome2
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome2 python-any-r1
 
 DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
 HOMEPAGE="https://wiki.gnome.org/GooCanvas;
@@ -20,6 +20,7 @@ RDEPEND="
introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 "
 DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
dev-util/glib-utils
>=dev-util/gtk-doc-am-1.16
>=sys-devel/gettext-0.19.4



[gentoo-commits] repo/gentoo:master commit in: games-puzzle/gnome-tetravex/

2021-04-19 Thread Matt Turner
commit: 8ebeb849bc2c8d950a196552eeed3cca9eb292ff
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:41:32 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:41:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebeb849

games-puzzle/gnome-tetravex: use ${EPYTHON}, not python3

Also use BDEPEND.

Closes: https://bugs.gentoo.org/768441
Signed-off-by: Matt Turner  gentoo.org>

 games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild 
b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
index 12f07175c24..040bddac900 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
@@ -2,9 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.40"
 
-inherit gnome.org gnome2-utils meson vala xdg
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Complete the puzzle by matching numbered tiles"
 HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex;
@@ -19,7 +20,9 @@ RDEPEND="
>=dev-libs/glib-2.42.0:2
gui? ( >=x11-libs/gtk+-3.22.23:3 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
$(vala_depend)
gui? ( dev-util/itstool )
>=sys-devel/gettext-0.19.8



[gentoo-commits] repo/gentoo:master commit in: gnome-extra/gucharmap/

2021-04-19 Thread Matt Turner
commit: e17d7655a6be0eb8cff2630daf1c5c373b44e572
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:39:36 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:39:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e17d7655

gnome-extra/gucharmap: use ${EPYTHON}, not python3

Closes: https://bugs.gentoo.org/768618
Signed-off-by: Matt Turner  gentoo.org>

 gnome-extra/gucharmap/gucharmap-13.0.4.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild 
b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
index 4a269319e58..43bfb99d791 100644
--- a/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-13.0.4.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2-utils meson vala xdg
+inherit gnome2-utils meson python-any-r1 vala xdg
 
 DESCRIPTION="Unicode character map viewer and library"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap;
@@ -21,7 +21,9 @@ UNICODE_VERSION="13.0"
 IUSE="debug +introspection gtk-doc vala"
 REQUIRED_USE="vala? ( introspection )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="
+   ${PYTHON_DEPS}
+   virtual/pkgconfig
>=sys-devel/gettext-0.19.8
gtk-doc? ( >=dev-util/gtk-doc-1 )
introspection? ( >=dev-libs/gobject-introspection-1.54:= )



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

2021-04-19 Thread Matt Turner
commit: 45c5278ff6b428560aaccc0371a28d0f0c42ac43
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 02:09:40 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 02:15:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c5278f

media-gfx/gthumb: Version bump to 3.10.3

Closes: https://bugs.gentoo.org/768060
Signed-off-by: Matt Turner  gentoo.org>

 media-gfx/gthumb/Manifest |  1 +
 media-gfx/gthumb/gthumb-3.10.3.ebuild | 96 +++
 2 files changed, 97 insertions(+)

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index ad4f326204f..5028bd7bbb0 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -1 +1,2 @@
 DIST gthumb-3.10.2.tar.xz 7582448 BLAKE2B 
29c6e74706e0f78c4a641841861f9e4d996c5baa7e9a26e12352e6c124402bad24af1ee45871f413de4935abe53109ffad484ed8d853c131cfa438714e4226b5
 SHA512 
3b4d23a744e0663a0358d41697b1b01ec2faa3f12fc29853c82de8109dec5ef66c3827ed6e0efb97147e34ab9643b42daedc3ee7babe03f486ba589323604b74
+DIST gthumb-3.10.3.tar.xz 7582472 BLAKE2B 
1e8274720428db05d4e14bb6a37ff55a74fe009ea551bda6fe75506f7187e03685903c2743fb6e66a33da73c974188528afad866c568bb14cc6f05749e08af7c
 SHA512 
2d157644c6efbf4f4ab31c525a4eecc69fbdf31003f922d5fdf8866ca6bbb44e5b8bd7f809be12de41178ddcef30bb49029ea06eb4feb8398a6aa1b052c6ae38

diff --git a/media-gfx/gthumb/gthumb-3.10.3.ebuild 
b/media-gfx/gthumb/gthumb-3.10.3.ebuild
new file mode 100644
index 000..79d24ac86c0
--- /dev/null
+++ b/media-gfx/gthumb/gthumb-3.10.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="Image viewer and browser for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/gthumb;
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff 
webp"
+
+RDEPEND="
+   >=dev-libs/glib-2.54.0:2
+   >=x11-libs/gtk+-3.16.0:3
+   exif? ( >=media-gfx/exiv2-0.21:= )
+   slideshow? (
+   >=media-libs/clutter-1.12.0:1.0
+   >=media-libs/clutter-gtk-1:1.0
+   )
+   gstreamer? (
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   media-plugins/gst-plugins-gtk:1.0
+   )
+   raw? ( >=media-libs/libraw-0.14:= )
+   http? (
+   >=net-libs/libsoup-2.42.0:2.4
+   >=dev-libs/json-glib-0.15.0
+   >=net-libs/webkit-gtk-1.10.0:4
+   )
+   gnome-keyring? ( >=app-crypt/libsecret-0.11 )
+   cdr? ( >=app-cdr/brasero-3.2.0 )
+   svg? ( >=gnome-base/librsvg-2.34:2 )
+   webp? ( >=media-libs/libwebp-0.2.0:= )
+   lcms? ( >=media-libs/lcms-2.6:2 )
+   colord? (
+   >=x11-misc/colord-1.3
+   >=media-libs/lcms-2.6:2
+   )
+
+   sys-libs/zlib
+   virtual/jpeg:0=
+   tiff? ( media-libs/tiff:= )
+   media-libs/libpng:0=
+   >=gnome-base/gsettings-desktop-schemas-0.1.4
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   ${PYTHON_DEPS}
+   dev-util/glib-utils
+   dev-util/itstool
+   sys-devel/bison
+   sys-devel/flex
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+"
+
+src_configure() {
+   local emesonargs=(
+   -Drun-in-place=false
+   $(meson_use exif exiv2)
+   $(meson_use slideshow clutter)
+   $(meson_use gstreamer)
+   -Dlibchamplain=false # Upstream still doesn't seem to consider 
this ready
+   $(meson_use colord)
+   $(meson_use tiff libtiff)
+   $(meson_use webp libwebp)
+   $(meson_use raw libraw)
+   $(meson_use svg librsvg)
+   $(meson_use gnome-keyring libsecret)
+   $(meson_use http webservices)
+   $(meson_use cdr libbrasero)
+   )
+
+   # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; 
some of upstream HAVE_COLORD code depends on HAVE_LCMS2
+   if use lcms || use colord; then
+   emesonargs+=( -Dlcms2=true )
+   else
+   emesonargs+=( -Dlcms2=false )
+   fi
+   meson_src_configure
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   gnome2_schemas_update
+}
+
+pkg_postrm() {
+   xdg_pkg_postrm
+   gnome2_schemas_update
+}



[gentoo-commits] repo/gentoo:master commit in: x11-misc/colord/

2021-04-19 Thread Matt Turner
commit: 416e15a26f7ceaa55c32562f8c951e797586c571
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Apr 20 01:52:22 2021 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Apr 20 01:52:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416e15a2

x11-misc/colord: Add missing dependency

Closes: https://bugs.gentoo.org/783972
Signed-off-by: Matt Turner  gentoo.org>

 x11-misc/colord/colord-1.4.5.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-misc/colord/colord-1.4.5.ebuild 
b/x11-misc/colord/colord-1.4.5.ebuild
index d98cb5325f1..2d77a0626a2 100644
--- a/x11-misc/colord/colord-1.4.5.ebuild
+++ b/x11-misc/colord/colord-1.4.5.ebuild
@@ -47,6 +47,7 @@ RDEPEND="${DEPEND}
 BDEPEND="
acct-group/colord
acct-user/colord
+   app-text/docbook-xsl-ns-stylesheets
dev-libs/libxslt
>=dev-util/intltool-0.35
>=sys-devel/gettext-0.17



[gentoo-commits] repo/gentoo:master commit in: x11-misc/grun/

2021-04-19 Thread Sam James
commit: a4a98bcc6e95624c7cc952a002fbd51c6b74d902
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:48:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:49:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a98bcc

x11-misc/grun: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 x11-misc/grun/grun-0.9.3-r1.ebuild | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild 
b/x11-misc/grun/grun-0.9.3-r1.ebuild
index 285e3e6bfdb..e354f70eaec 100644
--- a/x11-misc/grun/grun-0.9.3-r1.ebuild
+++ b/x11-misc/grun/grun-0.9.3-r1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch
+EAPI=7
 
 DESCRIPTION="A GTK based Run dialog resembling the Windows Run dialog, just 
like xexec"
 HOMEPAGE="https://github.com/lrgc/grun;
@@ -18,15 +17,15 @@ RDEPEND="
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
 "
-DEPEND="
-   ${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
 "
 
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-no_nls.patch
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-no_nls.patch
+)
 
 src_configure() {
[[ -z ${TERM} ]] && TERM=xterm



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xssstate/

2021-04-19 Thread Sam James
commit: af5e791f5cc0b8d4ed12074f1ee73a00d35a51f5
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:46:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:49:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5e791f

x11-misc/xssstate: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xssstate/xssstate-1.1.ebuild | 13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/x11-misc/xssstate/xssstate-1.1.ebuild 
b/x11-misc/xssstate/xssstate-1.1.ebuild
index 194e85aa60e..0dbd9da68b1 100644
--- a/x11-misc/xssstate/xssstate-1.1.ebuild
+++ b/x11-misc/xssstate/xssstate-1.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="A simple tool to retrieve the X screensaver state"
 HOMEPAGE="https://tools.suckless.org/x/xssstate;
@@ -11,7 +12,6 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
x11-libs/libX11
@@ -22,8 +22,13 @@ DEPEND="
x11-base/xorg-proto
 "
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.0.20130103-gentoo.patch
+   default
+
tc-export CC
 }
 



[gentoo-commits] repo/gentoo:master commit in: x11-misc/dmenu/, x11-misc/dmenu/files/

2021-04-19 Thread Sam James
commit: cde3d26b770ff8626ca582a04f28fde23e88bb56
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:49:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:49:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde3d26b

x11-misc/dmenu: drop 4.6 (epatch)

Signed-off-by: Sam James  gentoo.org>

 x11-misc/dmenu/Manifest |  1 -
 x11-misc/dmenu/dmenu-4.6.ebuild | 55 -
 x11-misc/dmenu/files/dmenu-4.6-gentoo.patch | 38 
 3 files changed, 94 deletions(-)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 85b473475b8..b5b7b6135f9 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,4 +1,3 @@
-DIST dmenu-4.6.tar.gz 15057 BLAKE2B 
87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495
 SHA512 
e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 
8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07
 SHA512 
fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 
56ba03a3dfd24e2fb0f45fec53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a
 SHA512 
c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3

diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
deleted file mode 100644
index 3105af4cd56..000
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch toolchain-funcs
-
-DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
-HOMEPAGE="https://tools.suckless.org/dmenu/;
-SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="xinerama"
-
-RDEPEND="
-   media-libs/fontconfig
-   x11-libs/libX11
-   x11-libs/libXft
-   xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   x11-base/xorg-proto
-"
-
-src_prepare() {
-   sed -i \
-   -e 's|^ @|  |g' \
-   -e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
-   -e '/^  echo/d' \
-   Makefile || die
-
-   epatch "${FILESDIR}"/${PN}-4.6-gentoo.patch
-
-   epatch_user
-}
-
-src_compile() {
-   emake CC=$(tc-getCC) \
-   "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 
2>/dev/null )" \
-   "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 
2>/dev/null )" \
-   "XINERAMAFLAGS=$(
-   usex xinerama "-DXINERAMA $(
-   $(tc-getPKG_CONFIG) --cflags xinerama 
2>/dev/null
-   )" ''
-   )" \
-   "XINERAMALIBS=$(
-   usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 
2>/dev/null)" ''
-   )"
-}
-
-src_install() {
-   emake DESTDIR="${D}" PREFIX="/usr" install
-}

diff --git a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
deleted file mode 100644
index 0d826e0d5a9..000
--- a/x11-misc/dmenu/files/dmenu-4.6-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
 a/config.mk
-+++ b/config.mk
-@@ -5,8 +5,8 @@
- PREFIX = /usr/local
- MANPREFIX = ${PREFIX}/share/man
- 
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = -I/usr/X11R6/include
-+X11LIB = -L/usr/X11R6/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -14,18 +14,18 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = -I/usr/include/freetype2
- # OpenBSD (uncomment)
- FREETYPEINC = ${X11INC}/freetype2
- 
- # includes and libs
--INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+INCS = ${X11INC} ${FREETYPEINC}
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
- 
- # flags
--CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L 
-DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
--LDFLAGS  = -s ${LIBS}

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

2021-04-19 Thread Sam James
commit: 6c408ec4cba6795b779b5a84de96f887ee3705b7
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:37:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:42:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c408ec4

x11-plugins/asapm: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 x11-plugins/asapm/asapm-3.1-r1.ebuild | 22 +++---
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/x11-plugins/asapm/asapm-3.1-r1.ebuild 
b/x11-plugins/asapm/asapm-3.1-r1.ebuild
index e0d99b379ad..538bca9b051 100644
--- a/x11-plugins/asapm/asapm-3.1-r1.ebuild
+++ b/x11-plugins/asapm/asapm-3.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools epatch toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="APM monitor for AfterStep"
 HOMEPAGE="http://tigr.net/afterstep/applets/;
@@ -12,19 +12,27 @@ 
SRC_URI="http://www.tigr.net/afterstep/download/asapm/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc -sparc ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11
x11-libs/libXpm"
-
 DEPEND="${RDEPEND}
x11-base/xorg-proto"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-ldflags.patch
+   "${FILESDIR}"/${P}-include.patch
+   "${FILESDIR}"/${P}-autoconf.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-{ldflags,include,autoconf}.patch
-   cp autoconf/configure.in . || die
-   AT_M4DIR=autoconf eautoconf
+   default
+
tc-export CC
+
+   cp autoconf/configure.in . || die
+   mv configure.{in,ac} || die
+
+   AT_M4DIR=autoconf eautoreconf
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: x11-misc/whaw/files/, x11-misc/whaw/

2021-04-19 Thread Sam James
commit: 3a13490f6b62457937267a4fbec23ab9b25e711b
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:41:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:42:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a13490f

x11-misc/whaw: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 .../files/whaw-0.2-fix-implicit-declaration-warning.patch |  4 ++--
 x11-misc/whaw/whaw-0.2.ebuild | 11 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch 
b/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch
index 155233b4b18..6a7ec008466 100644
--- a/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch
+++ b/x11-misc/whaw/files/whaw-0.2-fix-implicit-declaration-warning.patch
@@ -1,5 +1,5 @@
 whaw.c.orig2014-05-15 12:11:22.404504530 +0400
-+++ whaw.c 2014-05-15 12:11:43.004506325 +0400
+--- a/whaw.c
 b/whaw.c
 @@ -5,6 +5,7 @@
  #include 
  #include 

diff --git a/x11-misc/whaw/whaw-0.2.ebuild b/x11-misc/whaw/whaw-0.2.ebuild
index 1ce1370b7a2..6987e794828 100644
--- a/x11-misc/whaw/whaw-0.2.ebuild
+++ b/x11-misc/whaw/whaw-0.2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit epatch
+EAPI=7
 
 DESCRIPTION="Window manager independent Window Layout tool"
 HOMEPAGE="http://repetae.net/computer/whaw/;
@@ -20,7 +18,6 @@ RDEPEND="dev-libs/popt
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-   epatch "${FILESDIR}/${P}-fix-implicit-declaration-warning.patch"
-   epatch_user
-}
+PATCHES=(
+   "${FILESDIR}/${P}-fix-implicit-declaration-warning.patch"
+)



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-xmpp-receipts/

2021-04-19 Thread Sam James
commit: 6c80cd6b64de6fa402412eae6b1dd0b8f51cc135
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:29:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:42:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c80cd6b

x11-plugins/pidgin-xmpp-receipts: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 .../pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild  | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild 
b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
index f16b5e0b5d7..c62d3d1c907 100644
--- a/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
+++ b/x11-plugins/pidgin-xmpp-receipts/pidgin-xmpp-receipts-0.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vcs-snapshot toolchain-funcs
 
@@ -12,20 +12,19 @@ 
SRC_URI="https://github.com/noonien-d/pidgin-xmpp-receipts/archive/release_${PV}
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64"
-IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
-   GTK_PIDGIN_INCLUDES=$($(tc-getPKG_CONFIG) --cflags gtk+-2.0 pidgin)
+   GTK_PIDGIN_INCLUDES="$($(tc-getPKG_CONFIG) --cflags gtk+-2.0 pidgin)"
$(tc-getCC) ${LDFLAGS} -shared ${CFLAGS} -fpic ${GTK_PIDGIN_INCLUDES} 
-o ${PN/pidgin-/}.so ${PN/pidgin-/}.c || die
 }
 
 src_install() {
PLUGIN_DIR_PIDGIN=$($(tc-getPKG_CONFIG) --variable=plugindir pidgin)
-   dodir "${PLUGIN_DIR_PIDGIN}"
+
insinto "${PLUGIN_DIR_PIDGIN}"
doins ${PN/pidgin-/}.so
 }



[gentoo-commits] repo/gentoo:master commit in: x11-misc/xdock/

2021-04-19 Thread Sam James
commit: 7ab4763ae11611a921ea5fa1784e656fb6d084b0
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:40:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:42:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab4763a

x11-misc/xdock: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xdock/xdock-0.3.0.ebuild | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild 
b/x11-misc/xdock/xdock-0.3.0.ebuild
index 6cf304a5efb..dad806f3220 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0.ebuild
@@ -1,25 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch
+EAPI=7
 
-DESCRIPTION="emulates Window Maker docks (runs in any window manager)"
+inherit autotools
+
+DESCRIPTION="Emulates Window Maker docks (runs in any window manager)"
 HOMEPAGE="http://xdock.sourceforge.net;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
 DOCS=( API AUTHORS ChangeLog README TODO )
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-0.2.0-ldconfig.patch
+   default
+
sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
eautoreconf
 }



[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmSpaceWeather/files/, x11-plugins/wmSpaceWeather/

2021-04-19 Thread Sam James
commit: 672127fc4ca2d4e4e9e9cab61c580b8f057393b4
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:35:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:42:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=672127fc

x11-plugins/wmSpaceWeather: epatch->eapply

Signed-off-by: Sam James  gentoo.org>

 .../files/wmSpaceWeather-1.04_p19-gcc-10.patch  | 10 --
 .../files/wmSpaceWeather-1.04_p19-gentoo.patch  |  8 
 .../files/wmSpaceWeather-1.04_p19-getkp.patch   |  4 ++--
 .../wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild| 17 +
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git 
a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch 
b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
index f95e7e5ccbe..e40682abf8d 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch
@@ -1,6 +1,5 @@
-diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h 
wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h
 wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h1999-04-11 
07:35:53.0 +0200
-+++ wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h 2020-03-01 
16:13:29.843346352 +0100
+--- a/wmgeneral/wmgeneral.h
 b/wmgeneral/wmgeneral.h
 @@ -28,7 +28,7 @@
   /* Global variable */
  /***/
@@ -10,9 +9,8 @@ diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h 
wmspaceweather-1.
  
/***/
   /* Function Prototypes */
-diff -Naur wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c 
wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c
 wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c  
1999-04-11 07:35:53.0 +0200
-+++ wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c   2020-03-01 
16:13:38.172348429 +0100
+--- a/wmSpaceWeather/wmSpaceWeather.c
 b/wmSpaceWeather/wmSpaceWeather.c
 @@ -91,6 +91,7 @@
  charURL[1024];
  int   ForceUpdate2;

diff --git 
a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch 
b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
index 29cb5f984f1..104003a9b4f 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch
@@ -1,5 +1,5 @@
 wmSpaceWeather/Makefile.orig   2008-01-28 02:45:07.0 +0100
-+++ wmSpaceWeather/Makefile2008-01-28 02:46:04.0 +0100
+--- wmSpaceWeather/Makefile
 wmSpaceWeather/Makefile
 @@ -1,8 +1,8 @@
 -CC = gcc
 -CFLAGS = -O2 -Wall
@@ -48,8 +48,8 @@
 +  install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather
 +  install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1
  
 wmSpaceWeather/wmSpaceWeather.c.orig   2008-01-28 03:16:36.0 
+0100
-+++ wmSpaceWeather/wmSpaceWeather.c2008-01-28 03:22:12.0 +0100
+--- wmSpaceWeather/wmSpaceWeather.c
 wmSpaceWeather/wmSpaceWeather.c
 @@ -663,7 +663,7 @@
  if (GotDoubleClick1) {
  GotFirstClick1 = 0;

diff --git 
a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch 
b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
index 6d6d90137fe..aaea89f8ae0 100644
--- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
+++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch
@@ -1,5 +1,5 @@
 wmSpaceWeather/GetKp.orig  2008-01-28 14:20:43.0 +0100
-+++ wmSpaceWeather/GetKp   2008-01-28 14:22:48.0 +0100
+--- wmSpaceWeather/GetKp
 wmSpaceWeather/GetKp
 @@ -17,10 +17,10 @@
  unlink(CUR_INDEX);
  

diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild 
b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 66f4ca8ec60..7fdcae9bcf9 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN="wmspaceweather"
 MY_PV_ORIG="${PV/_p*}"
@@ -33,16 +33,17 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
 
-src_unpack() {
-   unpack ${MY_P_ORIG}.tar.gz
-   epatch "${DISTDIR}"/${MY_P_PATCH}.gz
-   epatch "${FILESDIR}"/${P}-gcc-10.patch
+src_prepare() {
+   default
+
+   cd .. || die
+
+   eapply "${WORKDIR}"/${MY_P_PATCH}
+   eapply "${FILESDIR}"/${P}-gcc-10.patch
 
# need to apply patches from Debian first, do NOT change the order
cd "${S}" || die
-   mv ../debian/patches "${WORKDIR}"/patch || die
-   EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
-   EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
+   eapply -p2 

[gentoo-commits] repo/gentoo:master commit in: x11-misc/xrestop/

2021-04-19 Thread Sam James
commit: 35553f82ef86d4d80229ad1c1ae778edda585763
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:39:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:42:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35553f82

x11-misc/xrestop: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 x11-misc/xrestop/xrestop-0.4.ebuild | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/x11-misc/xrestop/xrestop-0.4.ebuild 
b/x11-misc/xrestop/xrestop-0.4.ebuild
index 788c7a95953..42d0def453a 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="'Top' like statistics of X11 client's server side resource usage"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/xrestop;
@@ -19,13 +20,18 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   virtual/pkgconfig
x11-base/xorg-proto
 "
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+   "${FILESDIR}"/${P}-tinfo.patch
+)
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-tinfo.patch
+   default
+
eautoreconf
 }
-
-DOCS=( AUTHORS ChangeLog NEWS README )



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2021-04-19 Thread Michael Orlitzky
commit: 5b6cc80b2ba5a2ee76cd203379dedb0a1dbe6aae
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Apr 20 01:26:37 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Apr 20 01:26:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6cc80b

net-dns/djbdns: new revision with $AR and $RANLIB support.

Upstream lives on only in our thoughts and prayers, so I patched the
Makefile slightly to make this happen.

Closes: https://bugs.gentoo.org/784230
Closes: https://bugs.gentoo.org/784233
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...bdns-1.05-r34.ebuild => djbdns-1.05-r35.ebuild} |  3 +-
 net-dns/djbdns/files/AR-and-RANLIB-support.patch   | 48 ++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r34.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
similarity index 97%
rename from net-dns/djbdns/djbdns-1.05-r34.ebuild
rename to net-dns/djbdns/djbdns-1.05-r35.ebuild
index f2f79e02fd0..8cc9d5c60aa 100644
--- a/net-dns/djbdns/djbdns-1.05-r34.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/increase-cname-recustion-depth.patch"
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
"${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+   "${FILESDIR}/AR-and-RANLIB-support.patch"
 )
 
 src_prepare() {
@@ -73,7 +74,7 @@ src_compile() {
echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
echo "/usr" > conf-home || die
-   emake
+   emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
 }
 
 src_install() {

diff --git a/net-dns/djbdns/files/AR-and-RANLIB-support.patch 
b/net-dns/djbdns/files/AR-and-RANLIB-support.patch
new file mode 100644
index 000..792bc22a82c
--- /dev/null
+++ b/net-dns/djbdns/files/AR-and-RANLIB-support.patch
@@ -0,0 +1,48 @@
+From 5dde3af17a784615ab52130702458ca83d5b18bd Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Mon, 19 Apr 2021 21:11:02 -0400
+Subject: [PATCH 1/1] Makefile: support AR and RANLIB variables.
+
+These variables should default to the generic "ar" and "ranlib"
+commands, but if the user specifies them we now respect them.
+
+Gentoo-bug: https://bugs.gentoo.org/784230
+Gentoo-bug: https://bugs.gentoo.org/784233
+---
+ Makefile | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1429643..5742195 100644
+--- a/Makefile
 b/Makefile
+@@ -1,6 +1,8 @@
+ # Don't edit Makefile! Use conf-* for configuration.
+ 
+ SHELL=/bin/sh
++AR ?= ar
++RANLIB ?= ranlib
+ 
+ default: it
+ 
+@@ -581,7 +583,7 @@ warn-auto.sh systype
+   ( cat warn-auto.sh; \
+   echo 'main="$$1"; shift'; \
+   echo 'rm -f "$$main"'; \
+-  echo 'ar cr "$$main" $${1+"$$@"}'; \
++  echo '$(AR) cr "$$main" $${1+"$$@"}'; \
+   case "`cat systype`" in \
+   sunos-5.*) ;; \
+   unix_sv*) ;; \
+@@ -590,7 +592,7 @@ warn-auto.sh systype
+   dgux-*) ;; \
+   hp-ux-*) ;; \
+   sco*) ;; \
+-  *) echo 'ranlib "$$main"' ;; \
++  *) echo '$(RANLIB) "$$main"' ;; \
+   esac \
+   ) > makelib
+   chmod 755 makelib
+-- 
+2.26.3
+



[gentoo-commits] repo/gentoo:master commit in: net-misc/htbinit/files/, net-misc/htbinit/

2021-04-19 Thread Sam James
commit: 6ae3ebb95783618f3d3d047d38ef6fd700920076
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:19:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae3ebb9

net-misc/htbinit: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 net-misc/htbinit/files/htb.init-v0.8.5_tos.patch   |  4 +--
 net-misc/htbinit/files/htb.init_find_fix.patch |  4 +--
 .../{htb_0.8.5_esfq.diff => htb_0.8.5_esfq.patch}  |  4 +--
 .../{htb_0.8.5_ipv6.diff => htb_0.8.5_ipv6.patch}  |  4 +--
 net-misc/htbinit/files/prio_rule.patch |  4 +--
 net-misc/htbinit/files/timecheck_fix.patch |  4 +--
 net-misc/htbinit/htbinit-0.8.5-r7.ebuild   | 37 ++
 7 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch 
b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
index a798508631d..f45b5c07349 100644
--- a/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
+++ b/net-misc/htbinit/files/htb.init-v0.8.5_tos.patch
@@ -1,5 +1,5 @@
 htb.init.old   2005-03-15 14:56:08.328305288 +0200
-+++ htb.init   2005-03-15 15:05:16.612953352 +0200
+--- a/htb.init
 b/htb.init
 @@ -240,6 +240,10 @@
  #  Maximum packet size HTB creates rate maps for. The default should
  #  be sufficient for most cases, it certainly is for Ethernet.

diff --git a/net-misc/htbinit/files/htb.init_find_fix.patch 
b/net-misc/htbinit/files/htb.init_find_fix.patch
index 1b3e32a..27fce89ef2d 100644
--- a/net-misc/htbinit/files/htb.init_find_fix.patch
+++ b/net-misc/htbinit/files/htb.init_find_fix.patch
@@ -1,5 +1,5 @@
 htb.init.old   2004-01-29 22:41:23.0 +0100
-+++ htb.init   2006-09-08 00:22:11.0 +0200
+--- a/htb.init
 b/htb.init
 @@ -468,8 +468,8 @@
### List of classes in $HTB_PATH
htb_class_list () {

diff --git a/net-misc/htbinit/files/htb_0.8.5_esfq.diff 
b/net-misc/htbinit/files/htb_0.8.5_esfq.patch
similarity index 94%
rename from net-misc/htbinit/files/htb_0.8.5_esfq.diff
rename to net-misc/htbinit/files/htb_0.8.5_esfq.patch
index 3130f6868a4..506c505f8e4 100644
--- a/net-misc/htbinit/files/htb_0.8.5_esfq.diff
+++ b/net-misc/htbinit/files/htb_0.8.5_esfq.patch
@@ -1,5 +1,5 @@
 htb.init.old   2004-01-29 22:41:23.0 +0100
-+++ htb.init   2006-09-07 23:32:58.0 +0200
+--- a/htb.init
 b/htb.init
 @@ -226,7 +226,7 @@
  # priority. Also, classes with higher priority are offered excess
  # bandwidth first.

diff --git a/net-misc/htbinit/files/htb_0.8.5_ipv6.diff 
b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
similarity index 97%
rename from net-misc/htbinit/files/htb_0.8.5_ipv6.diff
rename to net-misc/htbinit/files/htb_0.8.5_ipv6.patch
index 815f99545a6..6e99319f2c6 100644
--- a/net-misc/htbinit/files/htb_0.8.5_ipv6.diff
+++ b/net-misc/htbinit/files/htb_0.8.5_ipv6.patch
@@ -1,5 +1,5 @@
 htb.init.old   2004-01-29 22:41:23.0 +0100
-+++ htb.init   2006-09-07 23:32:58.0 +0200
+--- a/htb.init
 b/htb.init
 @@ -275,6 +284,7 @@
  ### Filtering parameters
  #

diff --git a/net-misc/htbinit/files/prio_rule.patch 
b/net-misc/htbinit/files/prio_rule.patch
index 28471aabb84..429a1bed0ad 100644
--- a/net-misc/htbinit/files/prio_rule.patch
+++ b/net-misc/htbinit/files/prio_rule.patch
@@ -1,5 +1,5 @@
 htb.init.old   2004-01-29 22:41:23.0 +0100
-+++ htb.init   2006-09-08 00:03:32.0 +0200
+--- a/htb.init
 b/htb.init
 @@ -453,7 +457,7 @@
### Load & filter file $HTB_PATH/$1
htb_filter_file () {

diff --git a/net-misc/htbinit/files/timecheck_fix.patch 
b/net-misc/htbinit/files/timecheck_fix.patch
index de3791af997..4797ea6fd0a 100644
--- a/net-misc/htbinit/files/timecheck_fix.patch
+++ b/net-misc/htbinit/files/timecheck_fix.patch
@@ -1,5 +1,5 @@
 htb.init.old   2004-01-29 22:41:23.0 +0100
-+++ htb.init   2006-09-08 00:11:36.0 +0200
+--- a/htb.init
 b/htb.init
 @@ -891,7 +895,6 @@
  TIME_TMP=`date +%w/%k:%M`
  TIME_DOW=${TIME_TMP%%/*}

diff --git a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild 
b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
index c7a38b5aae1..1ae14a2d6a5 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r7.ebuild
@@ -1,28 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch linux-info
+inherit linux-info
 
 DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with 
iproute2"
 HOMEPAGE="https://www.sourceforge.net/projects/htbinit/;
 SRC_URI="mirror://sourceforge/htbinit/htb.init-v${PV}"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="ipv6 esfq"
+IUSE="esfq ipv6"
 
 DEPEND="sys-apps/iproute2"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}
+PATCHES=(

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

2021-04-19 Thread Sam James
commit: 18f832eeda40819e634dacf5f74acddd1e88b6af
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:14:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f832ee

net-misc/udpxy: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild 
b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
index f7f7a11e3a1..73364f91047 100644
--- a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
+++ b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit systemd toolchain-funcs versionator
+inherit systemd toolchain-funcs
 
-MY_PV=$(replace_version_separator 3 -)
+MY_PV=$(ver_rs 3 -)
 DESCRIPTION="Small daemon to relay multicast UDP traffic to client's TCP 
(HTTP) connection"
 HOMEPAGE="https://sourceforge.net/projects/udpxy/;
 SRC_URI="http://www.udpxy.com/download/1_23/${PN}.${MY_PV}-prod.tar.gz;
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_prepare() {
-   eapply_user
+   default
+
tc-export CC
 }
 
@@ -28,7 +28,7 @@ src_install() {
doman doc/en/*.1
dodoc CHANGES README
 
-   newinitd "${FILESDIR}/${PN}.initd" ${PN}
-   newconfd "${FILESDIR}/${PN}.confd" ${PN}
-   systemd_dounit "${FILESDIR}/${PN}.service"
+   newinitd "${FILESDIR}"/${PN}.initd ${PN}
+   newconfd "${FILESDIR}"/${PN}.confd ${PN}
+   systemd_dounit "${FILESDIR}"/${PN}.service
 }



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

2021-04-19 Thread Sam James
commit: ec13ce1676662f4197ce3443a303702867cfbf6c
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:11:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec13ce16

dev-libs/libevocosm: minor style change

Signed-off-by: Sam James  gentoo.org>

 dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild 
b/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
index 310e22a38db..fbf770314d2 100644
--- a/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
+++ b/dev-libs/libevocosm/libevocosm-3.3.1-r1.ebuild
@@ -12,15 +12,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-BDEPEND="doc? ( app-doc/doxygen )"
 RDEPEND="dev-libs/libcoyotl
dev-libs/libbrahe"
 DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
 PATCHES=(
-   "${FILESDIR}/${P}-gcc47.patch"
+   "${FILESDIR}"/${P}-gcc47.patch
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: net-nntp/newspost/files/, net-nntp/newspost/

2021-04-19 Thread Sam James
commit: ec5cfb01429f7ecb7ccf037517695d619ae8850a
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:50:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5cfb01

net-nntp/newspost: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 net-nntp/newspost/files/CAN-2005-0101.patch  |  4 ++--
 .../newspost/files/newspost-2.1.1-glibc-2.10.patch   | 20 
 net-nntp/newspost/files/newspost-2.1.1-nntp.patch|  8 
 net-nntp/newspost/newspost-2.1.1-r3.ebuild   | 17 ++---
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/net-nntp/newspost/files/CAN-2005-0101.patch 
b/net-nntp/newspost/files/CAN-2005-0101.patch
index 2bfdfc2c190..c81936be61b 100644
--- a/net-nntp/newspost/files/CAN-2005-0101.patch
+++ b/net-nntp/newspost/files/CAN-2005-0101.patch
@@ -1,5 +1,5 @@
 base/socket.c.orig  Tue Jan 18 11:08:02 2005
-+++ base/socket.c   Tue Jan 18 11:10:08 2005
+--- a/base/socket.c
 b/base/socket.c
 @@ -126,7 +126,7 @@
  
i = 0;

diff --git a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch 
b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
index fdaa78cbefb..8778ab41c25 100644
--- a/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
+++ b/net-nntp/newspost/files/newspost-2.1.1-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
 newspost-2.1.1.orig/base/newspost.c2003-04-23 18:33:23.0 
+0300
-+++ newspost-2.1.1/base/newspost.c 2009-08-06 14:46:41.0 +0300
+--- a/base/newspost.c
 b/base/newspost.c
 @@ -342,7 +342,7 @@
file = fopen(filename, "r");
if (file != NULL) {
@@ -10,9 +9,8 @@ diff -ur newspost-2.1.1.orig/base/newspost.c 
newspost-2.1.1/base/newspost.c
if(line == NULL){
text_buffer = buff_add(text_buffer, "\r\n");
continue;
-diff -ur newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
 newspost-2.1.1.orig/base/utils.c   2009-08-06 14:44:35.0 +0300
-+++ newspost-2.1.1/base/utils.c2009-08-06 14:45:20.0 +0300
+--- a/base/utils.c
 b/base/utils.c
 @@ -43,7 +43,7 @@
return NULL;
  }
@@ -22,9 +20,8 @@ diff -ur newspost-2.1.1.orig/base/utils.c 
newspost-2.1.1/base/utils.c
int c = fgetc(file);
buff = buff_free(buff);
while(TRUE){
-diff -ur newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
 newspost-2.1.1.orig/base/utils.h   2003-02-08 17:09:41.0 +0200
-+++ newspost-2.1.1/base/utils.h2009-08-06 14:45:13.0 +0300
+--- a/base/utils.h
 b/base/utils.h
 @@ -26,7 +26,7 @@
  file_entry * file_entry_alloc();
  file_entry * file_entry_free(file_entry *fe);
@@ -34,9 +31,8 @@ diff -ur newspost-2.1.1.orig/base/utils.h 
newspost-2.1.1/base/utils.h
  Buff *buff_add(Buff *buff, char *data, ... );
  Buff * buff_free(Buff *buff);
  Buff *buff_create(Buff *buff, char *data, ... );
-diff -ur newspost-2.1.1.orig/ui/options.c newspost-2.1.1/ui/options.c
 newspost-2.1.1.orig/ui/options.c   2003-04-23 18:33:33.0 +0300
-+++ newspost-2.1.1/ui/options.c2009-08-06 14:46:31.0 +0300
+--- a/ui/options.c
 b/ui/options.c
 @@ -332,7 +332,7 @@
file = fopen(filename->data, "r");
if (file != NULL) {

diff --git a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch 
b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
index 8779e8f36b4..7482d6203e0 100644
--- a/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
+++ b/net-nntp/newspost/files/newspost-2.1.1-nntp.patch
@@ -1,5 +1,5 @@
 newspost-2.1.1.orig/base/nntp.c
-+++ newspost-2.1.1/base/nntp.c
+--- a/base/nntp.c
 b/base/nntp.c
 @@ -26,6 +26,10 @@
  *** Public Routines
  **/
@@ -56,8 +56,8 @@
}

buff = buff_add(buff, "From: %s\r\n", data->from->data);
 newspost-2.1.1.orig/base/utils.c
-+++ newspost-2.1.1/base/utils.c
+--- a/base/utils.c
 b/base/utils.c
 @@ -44,7 +44,7 @@
  }
  

diff --git a/net-nntp/newspost/newspost-2.1.1-r3.ebuild 
b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
index 0bcce1c68dc..b0633bc47a2 100644
--- a/net-nntp/newspost/newspost-2.1.1-r3.ebuild
+++ b/net-nntp/newspost/newspost-2.1.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A usenet binary autoposter for unix"
 HOMEPAGE="http://newspost.unixcab.org/;
@@ -12,13 +12,16 @@ SRC_URI="http://newspost.unixcab.org/download/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
+PATCHES=(
# Should fix some problems with unexpected server replies, cf. bug 

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

2021-04-19 Thread Sam James
commit: c088139f7f4e8e58270ade61dad700e756b2fbf5
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:13:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c088139f

net-misc/tipcutils: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 net-misc/tipcutils/tipcutils-2.0.3.ebuild | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild 
b/net-misc/tipcutils/tipcutils-2.0.3.ebuild
index df7b679f31e..11ef103ecf4 100644
--- a/net-misc/tipcutils/tipcutils-2.0.3.ebuild
+++ b/net-misc/tipcutils/tipcutils-2.0.3.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit epatch
+EAPI=7
 
 DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
 HOMEPAGE="http://tipc.sourceforge.net;
@@ -16,7 +14,3 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=">=sys-kernel/linux-headers-2.6.39"
 
 DOCS=( README )
-
-src_prepare() {
-   epatch_user
-}



[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/ramspeed/

2021-04-19 Thread Sam James
commit: a5c8a7a200c4f55dab92434f6637eb6545762fae
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:41:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5c8a7a2

app-benchmarks/ramspeed: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild 
b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
index 01310ac9a2f..04993540079 100644
--- a/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
+++ b/app-benchmarks/ramspeed/ramspeed-3.5.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,14 +11,13 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Benchmarking for memory and cache"
 HOMEPAGE="http://www.alasir.com/software/ramspeed/;
 SRC_URI="http://www.alasir.com/software/${PN}/${MY_P}.tar.gz;
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="Alasir"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cpu_flags_x86_sse pic"
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
local obj
local arch_prefix=./
@@ -28,7 +27,7 @@ src_configure() {
 
tc-export CC AS
 
-   #fix the stack
+   # Fix the stack
append-ldflags -Wl,-z,noexecstack
obj=( ramsmp.o ${arch_prefix}{fltmark,fltmem,intmark,intmem}.o )
 
@@ -50,7 +49,7 @@ src_configure() {
obj+=( ${arch_prefix}{mmxmark,mmxmem,ssemark,ssemem}.o )
fi
 
-   echo "ramsmp: ${obj[@]}" > Makefile
+   echo "ramsmp: ${obj[@]}" > Makefile || die
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2021-04-19 Thread Sam James
commit: fb0d5b1cf473ffa594946f46670780f3c8eec8c6
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:42:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0d5b1c

app-backup/backuppc: drop 3.3.1-r5

Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r5.ebuild | 197 ---
 1 file changed, 197 deletions(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
deleted file mode 100644
index dd944952eb5..000
--- a/app-backup/backuppc/backuppc-3.3.1-r5.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit depend.apache epatch user systemd
-
-MY_P="BackupPC-${PV}"
-
-DESCRIPTION="High-performance backups to a server's disk"
-HOMEPAGE="http://backuppc.sourceforge.net/;
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE="rss samba"
-
-# The CGI modules are handled in $RDEPEND.
-APACHE_MODULES="apache2_modules_alias," # RedirectMatch
-APACHE_MODULES+="apache2_modules_authn_core," # AuthType
-APACHE_MODULES+="apache2_modules_authz_core," # Require
-APACHE_MODULES+="apache2_modules_authz_host," # Require host
-APACHE_MODULES+="apache2_modules_authz_user" # Require valid-user
-
-DEPEND="dev-lang/perl
-   app-admin/apache-tools
-   app-admin/makepasswd"
-
-# Older versions of mod_perl think they're compatibile with apache-2.4,
-# so we require the new one explicitly.
-RDEPEND="${DEPEND}
-   virtual/perl-IO-Compress
-   dev-perl/Archive-Zip
-   dev-perl/CGI
-   dev-perl/libwww-perl
-   app-arch/tar
-   app-arch/par2cmdline
-   app-arch/gzip
-   app-arch/bzip2
-   virtual/mta
-   >=www-apache/mod_perl-2.0.9
-   www-apache/mpm_itk
-   || ( >=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgi]
-
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_cgid]
-
>=www-servers/apache-2.4[${APACHE_MODULES},apache2_modules_fcgid] )
-   net-misc/rsync
-   dev-perl/File-RsyncP
-   rss? ( dev-perl/XML-RSS )
-   samba? ( net-fs/samba )"
-
-need_apache2_4
-
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-CGIDIR="/usr/lib/backuppc/htdocs"
-CONFDIR="/etc/BackupPC"
-DATADIR="/var/lib/backuppc"
-DOCDIR="/usr/share/doc/${PF}"
-LOGDIR="/var/log/BackupPC"
-
-pkg_setup() {
-   enewgroup backuppc
-   enewuser backuppc -1 /bin/bash /var/lib/backuppc backuppc
-}
-
-src_prepare() {
-   epatch "${FILESDIR}/3.3.0/01-fix-configure.pl.patch"
-   epatch "${FILESDIR}/3.3.0/02-fix-config.pl-formatting.patch"
-   epatch "${FILESDIR}/3.3.0/03-reasonable-config.pl-defaults.patch"
-
-   epatch "${FILESDIR}/3.2.0/04-add-docdir-marker.patch"
-   epatch "${FILESDIR}/3.2.0/05-nicelevel.patch"
-
-   epatch "${FILESDIR}"/${P}-perl522.patch #580254
-   epatch "${FILESDIR}"/${P}-perl526.patch #594128
-
-   # Fix docs location using the marker that we've patched in.
-   sed -i "s+__DOCDIR__+${DOCDIR}+" "lib/BackupPC/CGI/View.pm" \
-   || die "failed to sed the documentation location"
-}
-
-src_install() {
-   local myconf
-   myconf=""
-   if use samba ; then
-   myconf="--bin-path smbclient=$(type -p smbclient)"
-   myconf="${myconf} --bin-path nmblookup=$(type -p nmblookup)"
-   fi
-
-   /usr/bin/env perl ./configure.pl \
-   --batch \
-   --bin-path perl=$(type -p perl) \
-   --bin-path tar=$(type -p tar) \
-   --bin-path rsync=$(type -p rsync) \
-   --bin-path ping=$(type -p ping) \
-   --bin-path df=$(type -p df) \
-   --bin-path ssh=$(type -p ssh) \
-   --bin-path sendmail=$(type -p sendmail) \
-   --bin-path hostname=$(type -p hostname) \
-   --bin-path gzip=$(type -p gzip) \
-   --bin-path bzip2=$(type -p bzip2) \
-   --config-dir "${CONFDIR}" \
-   --install-dir /usr \
-   --data-dir "${DATADIR}" \
-   --hostname 127.0.0.1 \
-   --uid-ignore \
-   --dest-dir "${D%/}" \
-   --html-dir "${CGIDIR}"/image \
-   --html-dir-url /image \
-   --cgi-dir "${CGIDIR}" \
-   --fhs \
-   ${myconf} || die "failed the configure.pl script"
-
-   ebegin "Installing documentation"
-
-   pod2man \
-   -errors=none \
-   --section=8 \
-   --center="BackupPC manual" \
-   "${S}"/doc/BackupPC.pod backuppc.8 \
-   || die "failed to generate man page"
-
-   doman backuppc.8
-
-   # Place the documentation in the correct location
-   dodoc 

[gentoo-commits] repo/gentoo:master commit in: app-backup/backuppc/

2021-04-19 Thread Sam James
commit: 669dd58db0cfcb3952fe48db9dc46fa4e54f0935
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:41:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669dd58d

app-backup/backuppc: forward stable keywords to 3.3.1-r6

Signed-off-by: Sam James  gentoo.org>

 app-backup/backuppc/backuppc-3.3.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild 
b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
index a2b9c23aa1c..97bacafc0e0 100644
--- a/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
+++ b/app-backup/backuppc/backuppc-3.3.1-r6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="rss samba"
 
 DEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-ftp/cmdftp/

2021-04-19 Thread Sam James
commit: c2daa9d5a582b51db248e9ba6612c6f2497592b2
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:45:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2daa9d5

net-ftp/cmdftp: update EAPI 5 -> 7

Signed-off-by: Sam James  gentoo.org>

 net-ftp/cmdftp/cmdftp-0.9.8.ebuild | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild 
b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
index ecc0224ef1e..0e11dd145c5 100644
--- a/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
+++ b/net-ftp/cmdftp/cmdftp-0.9.8.ebuild
@@ -1,20 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-DESCRIPTION="Light weight, yet robust command line FTP client with shell-like
-functions."
+DESCRIPTION="Light weight, yet robust command line FTP client with 
shell-likefunctions"
 HOMEPAGE="https://savannah.nongnu.org/projects/cmdftp/;
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
 
 DOCS=( NEWS README AUTHORS )
 



[gentoo-commits] repo/gentoo:master commit in: dev-libs/libcoyotl/, dev-libs/libcoyotl/files/

2021-04-19 Thread Sam James
commit: 18414add5206e04741dcc5a3b38c6e533de31939
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 01:09:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18414add

dev-libs/libcoyotl: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch | 10 -
 dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch |  4 ++--
 dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild | 32 +---
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch 
b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
index 4d3391e2116..e81476565e3 100644
--- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
+++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.3.patch
@@ -1,6 +1,5 @@
-diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp 
libcoyotl-3.1.0/libcoyotl/command_line.cpp
 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp2008-03-21 
22:41:41.0 +0100
-+++ libcoyotl-3.1.0/libcoyotl/command_line.cpp 2008-03-21 22:41:59.0 
+0100
+--- a/libcoyotl/command_line.cpp
 b/libcoyotl/command_line.cpp
 @@ -30,10 +30,13 @@
  //  http://www.coyotegulch.com
  //  
@@ -15,9 +14,8 @@ diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/command_line.cpp 
libcoyotl-3.1.0/libco
  command_line::command_line(int argc, char * argv[], const set & 
bool_opts)
: m_options(),
  m_inputs(),
-diff -NrU5 libcoyotl-3.1.0.orig/libcoyotl/sortutil.h 
libcoyotl-3.1.0/libcoyotl/sortutil.h
 libcoyotl-3.1.0.orig/libcoyotl/sortutil.h  2008-03-21 22:41:41.0 
+0100
-+++ libcoyotl-3.1.0/libcoyotl/sortutil.h   2008-03-21 22:41:59.0 
+0100
+--- a/libcoyotl/sortutil.h
 b/libcoyotl/sortutil.h
 @@ -34,10 +34,11 @@
  //---
  

diff --git a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch 
b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
index 443cbe2a865..266a5631fec 100644
--- a/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
+++ b/dev-libs/libcoyotl/files/3.1.0-gcc-4.7.patch
@@ -1,5 +1,5 @@
 libcoyotl/maze_renderer.cpp.ORIG   2005-10-10 06:48:30.0 +0200
-+++ libcoyotl/maze_renderer.cpp2013-04-12 10:29:31.127689828 +0200
+--- a/libcoyotl/maze_renderer.cpp
 b/libcoyotl/maze_renderer.cpp
 @@ -36,6 +36,8 @@
  #include "maze_renderer.h"
  using namespace libcoyotl;

diff --git a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild 
b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
index 3aba111d9a9..0e59b18b775 100644
--- a/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
+++ b/dev-libs/libcoyotl/libcoyotl-3.1.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools epatch ltprune
+inherit autotools
 
 DESCRIPTION="A collection of portable C++ classes"
 HOMEPAGE="http://www.coyotegulch.com/products/libcoyotl/;
@@ -12,39 +12,45 @@ SRC_URI="http://www.coyotegulch.com/distfiles/${P}.tar.gz;
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc static-libs"
+IUSE="doc"
 
 RDEPEND="media-libs/libpng:0="
-DEPEND="${RDEPEND}
-   doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=(
+   "${FILESDIR}"/${PV}-gcc-4.3.patch
+   "${FILESDIR}"/${PV}-gcc-4.7.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}/${PV}-gcc-4.3.patch"
-   epatch "${FILESDIR}/${PV}-gcc-4.7.patch"
-   epatch_user
+   default
+
eautoreconf
 }
 
 src_configure() {
-   ac_cv_prog_HAVE_DOXYGEN="false" econf $(use_enable static-libs static)
+   ac_cv_prog_HAVE_DOXYGEN="false" econf --disable-static
 }
 
 src_compile() {
emake
 
if use doc ; then
-   cd docs
+   cd docs || die
doxygen libcoyotl.doxygen || die "generating docs failed"
fi
 }
 
 src_install() {
default
-   prune_libtool_files
+
+   find "${ED}" -name '*.la' -delete || die
+
if use doc ; then
-   dohtml docs/html/*
+   docinto html
+   dodoc docs/html/*
fi
 }



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

2021-04-19 Thread Sam James
commit: 4d5bf0340eafdc658da6fb6962a2a4a9f93bad11
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:36:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5bf034

app-crypt/WiRouterKeyRec: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild 
b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
index e6e66ef9838..dc69de0abd2 100644
--- a/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
+++ b/app-crypt/WiRouterKeyRec/WiRouterKeyRec-1.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -11,18 +11,17 @@ MY_P="${MY_PN}_${PV}"
 DESCRIPTION="Recovery tool for wpa passphrase"
 HOMEPAGE="https://www.salvatorefresta.net;
 SRC_URI="https://tools.salvatorefresta.net/${MY_P}.zip -> ${P}.zip"
+S="${WORKDIR}"/${MY_P}
 
-KEYWORDS="amd64 ppc x86"
-IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
+   default
+
sed -i "s:wirouterkeyrec:${PN}:" src/*.h || die
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/dbench/

2021-04-19 Thread Sam James
commit: 4d316ed6230c2edca38608976faf967c21379469
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:39:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d316ed6

app-benchmarks/dbench: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-benchmarks/dbench/dbench-4.0.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app-benchmarks/dbench/dbench-4.0.ebuild 
b/app-benchmarks/dbench/dbench-4.0.ebuild
index ca159a52f2a..1e2cda61523 100644
--- a/app-benchmarks/dbench/dbench-4.0.ebuild
+++ b/app-benchmarks/dbench/dbench-4.0.ebuild
@@ -1,27 +1,27 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools toolchain-funcs
 
 DESCRIPTION="Popular filesystem benchmark"
 SRC_URI="https://www.samba.org/ftp/pub/tridge/dbench/${P}.tar.gz;
 HOMEPAGE="https://www.samba.org/ftp/tridge/dbench/;
-SLOT="0"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
 
 DEPEND="dev-libs/popt"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-   eautoheader
-   eautoconf
-   sed -i -e \
-   "s:\$(CC) -o:\$(CC) \$(LDFLAGS) -o:" \
-   Makefile.in || die
+   default
+
+   sed -i -e "s:\$(CC) -o:\$(CC) \$(LDFLAGS) -o:" Makefile.in || die
+   mv configure.{in,ac} || die
+
eautoreconf
 }
 
@@ -38,5 +38,5 @@ src_install() {
 }
 
 pkg_postinst() {
-   elog "You can find the client.txt file in ${ROOT}usr/share/dbench."
+   elog "You can find the client.txt file in ${EROOT}/usr/share/dbench."
 }



[gentoo-commits] repo/gentoo:master commit in: app-editors/levee/files/, app-editors/levee/

2021-04-19 Thread Sam James
commit: d0612febff6859d90f20ab854fba0943a62fe4ef
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:31:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0612feb

app-editors/levee: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-editors/levee/files/levee-3.4o-darwin.patch  |  4 +--
 app-editors/levee/files/levee-3.5-glibc210.patch | 25 +++--
 app-editors/levee/files/levee-3.5a-QA.patch  |  5 ++--
 app-editors/levee/levee-3.5a.ebuild  | 34 +---
 4 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/app-editors/levee/files/levee-3.4o-darwin.patch 
b/app-editors/levee/files/levee-3.4o-darwin.patch
index 9481b1a3ade..0af6f799496 100644
--- a/app-editors/levee/files/levee-3.4o-darwin.patch
+++ b/app-editors/levee/files/levee-3.4o-darwin.patch
@@ -1,5 +1,5 @@
 unixcall.c.orig2007-03-18 17:46:05 +0100
-+++ unixcall.c 2007-03-18 17:51:13 +0100
+--- a/unixcall.c
 b/unixcall.c
 @@ -77,6 +77,13 @@
  static int ioset = 0;
  static struct termios old;

diff --git a/app-editors/levee/files/levee-3.5-glibc210.patch 
b/app-editors/levee/files/levee-3.5-glibc210.patch
index 51cc829cda2..f290613d263 100644
--- a/app-editors/levee/files/levee-3.5-glibc210.patch
+++ b/app-editors/levee/files/levee-3.5-glibc210.patch
@@ -1,6 +1,5 @@
-diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
 levee-3.5.original/editcor.c   2009-07-21 22:58:18.0 +
-+++ levee-3.5/editcor.c2009-07-21 23:07:21.0 +
+--- a/editcor.c
 b/editcor.c
 @@ -183,11 +183,11 @@
  
  strcpy(scratch, "/tmp/lv.XX");
@@ -14,9 +13,8 @@ diff -NrU5 levee-3.5.original/editcor.c levee-3.5/editcor.c
  if ( (tf = mkstemp(scratch)) < 0 ) {
prints("[tempfile error]");
return FALSE;
-diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
 levee-3.5.original/extern.h2009-07-21 22:58:18.0 +
-+++ levee-3.5/extern.h 2009-07-21 23:02:39.0 +
+--- a/extern.h
 b/extern.h
 @@ -195,11 +195,11 @@
  extern exec_type PROC editcore();
  
@@ -30,9 +28,8 @@ diff -NrU5 levee-3.5.original/extern.h levee-3.5/extern.h
  extern bool PROC pushb(),pushi(),pushmem(),uputcmd(), delete_to_undo();
  extern bool PROC ok_to_scroll(), move_to_undo();
  
-diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
 levee-3.5.original/main.c  2009-07-21 22:58:18.0 +
-+++ levee-3.5/main.c   2009-07-21 23:09:52.0 +
+--- a/main.c
 b/main.c
 @@ -251,11 +251,11 @@
println();
  
@@ -46,9 +43,8 @@ diff -NrU5 levee-3.5.original/main.c levee-3.5/main.c
if (mode == E_VISUAL && zotscreen && noquit) {  /*ask for more*/
prints(" [more]");
if ((ch=peekc()) == 13 || ch == ' ' || ch == ':')
-diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
 levee-3.5.original/misc.c  2009-07-21 22:58:18.0 +
-+++ levee-3.5/misc.c   2009-07-21 23:09:10.0 +
+--- a/misc.c
 b/misc.c
 @@ -19,11 +19,11 @@
   */
  #include "levee.h"
@@ -62,9 +58,8 @@ diff -NrU5 levee-3.5.original/misc.c levee-3.5/misc.c
  int len;
  char flag;
  
-diff -NrU5 levee-3.5.original/move.c levee-3.5/move.c
 levee-3.5.original/move.c  2009-07-21 22:58:18.0 +
-+++ levee-3.5/move.c   2009-07-21 23:10:26.0 +
+--- a/move.c
 b/move.c
 @@ -158,11 +158,11 @@
  case FSEARCH:
  case BSEARCH:

diff --git a/app-editors/levee/files/levee-3.5a-QA.patch 
b/app-editors/levee/files/levee-3.5a-QA.patch
index 7e37c76b34a..f6553813d8c 100644
--- a/app-editors/levee/files/levee-3.5a-QA.patch
+++ b/app-editors/levee/files/levee-3.5a-QA.patch
@@ -1,6 +1,5 @@
-diff -NrU5 levee-3.5a.original/configure.inc levee-3.5a/configure.inc
 levee-3.5a.original/configure.inc  2009-08-12 19:51:26.0 +
-+++ levee-3.5a/configure.inc   2009-08-12 20:13:41.0 +
+--- a/configure.inc
 b/configure.inc
 @@ -1074,11 +1074,11 @@
  else
PROG_INSTALL="$DEST"

diff --git a/app-editors/levee/levee-3.5a.ebuild 
b/app-editors/levee/levee-3.5a.ebuild
index 3f4400b4c76..e5a02aa046f 100644
--- a/app-editors/levee/levee-3.5a.ebuild
+++ b/app-editors/levee/levee-3.5a.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit toolchain-funcs epatch
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Really tiny vi clone, for things like rescue disks"
 HOMEPAGE="http://www.pell.chi.il.us/~orc/Code/;
@@ -11,34 +12,35 @@ 
SRC_URI="http://www.pell.chi.il.us/~orc/Code/levee/${P}.tar.gz;
 LICENSE="levee"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos 
~sparc-solaris ~x86-solaris"
-IUSE=""
 
 RDEPEND="
!app-text/lv
sys-libs/ncurses:0=
 "
-DEPEND="
-   ${RDEPEND}
-   

[gentoo-commits] repo/gentoo:master commit in: app-editors/hexedit/

2021-04-19 Thread Sam James
commit: 86800841556927c5a4a436475efb1839d73c5c5e
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:34:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86800841

app-editors/hexedit: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-editors/hexedit/hexedit-1.2.13.ebuild | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild 
b/app-editors/hexedit/hexedit-1.2.13.ebuild
index 10627d3f7c5..d0b42fcc75f 100644
--- a/app-editors/hexedit/hexedit-1.2.13.ebuild
+++ b/app-editors/hexedit/hexedit-1.2.13.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools epatch
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="View and edit files in hex or ASCII"
 HOMEPAGE="http://rigaux.org/hexedit.html;
@@ -15,10 +16,15 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 
~s390 sparc x86 ~amd64-li
 DEPEND="sys-libs/ncurses:="
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.2.13-tinfo.patch
+)
 
 src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.2.13-tinfo.patch
+   default
+
mv configure.in configure.ac || die
eautoreconf
 }



[gentoo-commits] repo/gentoo:master commit in: net-news/rsstool/

2021-04-19 Thread Sam James
commit: f5649b369799cee9fde7ef40c2a2b1436461623f
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:48:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5649b36

net-news/rsstool: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 net-news/rsstool/rsstool-1.0.1_rc2.ebuild | 23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/net-news/rsstool/rsstool-1.0.1_rc2.ebuild 
b/net-news/rsstool/rsstool-1.0.1_rc2.ebuild
index f060be09ef3..b662c685145 100644
--- a/net-news/rsstool/rsstool-1.0.1_rc2.ebuild
+++ b/net-news/rsstool/rsstool-1.0.1_rc2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -10,20 +10,22 @@ MY_P=${PN}-${PV/_}
 DESCRIPTION="cmdline tool to read, parse, merge, and write RSS (and Atom) 
feeds"
 HOMEPAGE="http://rsstool.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}-src.zip"
+S="${WORKDIR}"/${MY_P}-src/src
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
 
-RDEPEND="dev-libs/libxml2
-   net-misc/curl"
-DEPEND="${RDEPEND}
-   app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}-src/src
+RDEPEND="
+   dev-libs/libxml2
+   net-misc/curl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 src_prepare() {
+   default
+
sed -e '1i#!/bin/bash' -i configure || die
 }
 
@@ -34,5 +36,6 @@ src_compile() {
 src_install() {
emake DESTDIR="${D}" BINDIR="/usr/bin" install
 
-   dohtml ../{changes,faq,readme}.html
+   docinto html
+   dodoc ../{changes,faq,readme}.html
 }



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

2021-04-19 Thread Sam James
commit: 0d9b5d86d15e112059b4b0c72a2cb9a1d0ca92a9
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:36:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9b5d86

app-crypt/crackpkcs12: update EAPI 5 -> 7

Signed-off-by: Sam James  gentoo.org>

 app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild 
b/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
index e120fce2d80..f6fa7524d91 100644
--- a/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
+++ b/app-crypt/crackpkcs12/crackpkcs12-0.2.10.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-DESCRIPTION="multithreaded program to crack PKCS#12 files"
+DESCRIPTION="Multithreaded program to crack PKCS#12 files"
 HOMEPAGE="http://crackpkcs12.sourceforge.net/;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl"
 
-RDEPEND="!libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:0= )"
+RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: app-backup/reoback/

2021-04-19 Thread Sam James
commit: a8cc0dc6bd0f819a8bd36eeb20743ac0deae2dfd
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:43:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cc0dc6

app-backup/reoback: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-backup/reoback/reoback-1.0_p3-r1.ebuild | 14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app-backup/reoback/reoback-1.0_p3-r1.ebuild 
b/app-backup/reoback/reoback-1.0_p3-r1.ebuild
index fbd1b4e23e8..67a63e15698 100644
--- a/app-backup/reoback/reoback-1.0_p3-r1.ebuild
+++ b/app-backup/reoback/reoback-1.0_p3-r1.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vcs-clean
 
 DESCRIPTION="Reoback Backup Solution"
 HOMEPAGE="http://reoback.sourceforge.net/;
 SRC_URI="mirror://sourceforge/reoback/reoback-${PV/_p/_r}.tar.gz"
+S="${WORKDIR}"/${PN}-${PV/_*}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.6.1"
 DEPEND=">=app-arch/tar-1.13"
 
-S=${WORKDIR}/${PN}-${PV/_*}
-
 src_prepare() {
+   default
+
ecvs_clean
+
sed \
-e '/^config=/s:=.*:=/etc/reoback/settings.conf:' \
-e '/^reoback=/s:=.*:=/usr/sbin/reoback.pl:' \
@@ -29,15 +30,18 @@ src_prepare() {
 
 src_install() {
dosbin reoback.pl
+
insinto /etc/reoback
doins conf/*
fperms o-x /usr/sbin/reoback.pl
+
insinto /etc/cron.daily
newins run_reoback.sh reoback
+
dodoc docs/{BUGS,CHANGES,INSTALL,MANUALS,README,TODO}
 }
 
 pkg_postinst() {
elog "Reoback can now be activated by simply configuring the files in"
-   elog "/etc/reoback and then doing: chmod +x /etc/cron.daily/reoback"
+   elog "${EROOT}/etc/reoback and then doing: chmod +x 
${EROOT}/etc/cron.daily/reoback"
 }



[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/

2021-04-19 Thread Sam James
commit: 6ed6b01edf302e06d9dd585467f824b82e92f617
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:28:26 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed6b01e

app-editors/nedit: forward stable keywords to 5.6-r2

Signed-off-by: Sam James  gentoo.org>

 app-editors/nedit/nedit-5.6-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/nedit/nedit-5.6-r2.ebuild 
b/app-editors/nedit/nedit-5.6-r2.ebuild
index 018a58628a3..bc781249d83 100644
--- a/app-editors/nedit/nedit-5.6-r2.ebuild
+++ b/app-editors/nedit/nedit-5.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=x11-libs/motif-2.3:0
x11-libs/libXt



[gentoo-commits] repo/gentoo:master commit in: dev-libs/tvmet/, dev-libs/tvmet/files/

2021-04-19 Thread Sam James
commit: 292fe10e63f2190148344dfda03be5395466f924
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:26:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292fe10e

dev-libs/tvmet: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 .../tvmet/files/tvmet-1.7.2-respect-cxxflags.patch |  5 ++---
 dev-libs/tvmet/tvmet-1.7.2-r2.ebuild   | 23 ++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch 
b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
index 2749c913134..f2116434bca 100644
--- a/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
+++ b/dev-libs/tvmet/files/tvmet-1.7.2-respect-cxxflags.patch
@@ -1,6 +1,5 @@
-diff -ur tvmet-1.7.2-orig/configure tvmet-1.7.2/configure
 tvmet-1.7.2-orig/configure 2009-04-19 16:27:20.0 -0400
-+++ tvmet-1.7.2/configure  2009-04-19 16:48:52.0 -0400
+--- a/configure
 b/configure
 @@ -2659,11 +2659,9 @@
   ;;
   *:*)   # Simple initialization syntax

diff --git a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild 
b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
index f382b9c7e94..17b51a76512 100644
--- a/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
+++ b/dev-libs/tvmet/tvmet-1.7.2-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit epatch
+EAPI=7
 
 DESCRIPTION="Tiny Vector Matrix library using Expression Templates"
 HOMEPAGE="http://tvmet.sourceforge.net/;
@@ -15,11 +13,15 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="doc? ( app-doc/doxygen )
-   test? ( dev-util/cppunit )"
+BDEPEND="doc? ( app-doc/doxygen )"
+DEPEND="test? ( dev-util/cppunit )"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-respect-cxxflags.patch
+)
 
 src_prepare() {
-   epatch "${FILESDIR}/${P}-respect-cxxflags.patch"
+   default
 
sed -i \
-e 's|^GENERATE_LATEX.*|GENERATE_LATEX = NO|' \
@@ -41,13 +43,18 @@ src_configure() {
 
 src_compile() {
default
+
if use doc ; then
-   cd doc
+   cd doc || die
doxygen Doxyfile || die "doxygen failed"
fi
 }
 
 src_install() {
default
-   use doc && dohtml -r doc/html/*
+
+   if use doc ; then
+   docinto html
+   dodoc -r doc/html/*
+   fi
 }



[gentoo-commits] repo/gentoo:master commit in: app-editors/nedit/

2021-04-19 Thread Sam James
commit: 473d288270583be4a12cd335a2aa28c8c2cac47d
Author: Sam James  gentoo  org>
AuthorDate: Tue Apr 20 00:28:41 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 20 01:20:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473d2882

app-editors/nedit: drop 5.6-r1

Signed-off-by: Sam James  gentoo.org>

 app-editors/nedit/nedit-5.6-r1.ebuild | 75 ---
 1 file changed, 75 deletions(-)

diff --git a/app-editors/nedit/nedit-5.6-r1.ebuild 
b/app-editors/nedit/nedit-5.6-r1.ebuild
deleted file mode 100644
index 3e0c9aebeb9..000
--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit desktop epatch toolchain-funcs
-
-DESCRIPTION="Multi-purpose text editor for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/nedit;
-SRC_URI="
-   
https://downloads.sourceforge.net/project/${PN}/${PN}-source/${P}a-src.tar.gz
-   https://dev.gentoo.org/~jlec/distfiles/${PN}.png.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=x11-libs/motif-2.3:0
-   x11-libs/libXt
-   x11-libs/libX11"
-DEPEND="${RDEPEND}
-   || ( dev-util/yacc sys-devel/bison )
-   dev-lang/perl"
-
-S="${WORKDIR}/${PN}-5.6"
-
-src_prepare() {
-   #respecting LDFLAGS, bug #208189
-   epatch \
-   "${FILESDIR}"/${P}-format.patch \
-   "${FILESDIR}"/${P}-ldflags.patch \
-   "${FILESDIR}"/${P}-40_Pointer_to_Integer.patch \
-   "${FILESDIR}"/${P}-security.patch
-   sed \
-   -e "s:bin/:${EPREFIX}/bin/:g" \
-   -i Makefile source/preferences.c source/help_data.h 
source/nedit.c Xlt/Makefile || die
-   sed \
-   -e "s:nc:neditc:g" -i doc/nc.pod || die
-   sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:" -e "s:check_tif_rule::" \
-   makefiles/Makefile.linux || die
-   sed -i -e "s:CFLAGS=-O:CFLAGS=${CFLAGS}:"  \
-  -e "s:MOTIFDIR=/usr/local:MOTIFDIR=${EPREFIX}/usr:" \
-  -e "s:-lX11:-lX11 -lXmu -liconv:"   \
-  -e "s:check_tif_rule::" \
-   makefiles/Makefile.macosx || die
-
-   epatch_user
-}
-
-src_compile() {
-   case "${CHOST}" in
-   *-darwin*)
-   emake CC="$(tc-getCC)" AR="$(tc-getAR)" macosx
-   ;;
-   *-linux*)
-   emake CC="$(tc-getCC)" AR="$(tc-getAR)" linux
-   ;;
-   esac
-   emake VERSION="NEdit ${PV}" -C doc all
-}
-
-src_install() {
-   dobin source/nedit
-   newbin source/nc neditc
-
-   make_desktop_entry "${PN}"
-   doicon "${WORKDIR}/${PN}.png"
-
-   newman doc/nedit.man nedit.1
-   newman doc/nc.man neditc.1
-
-   dodoc README ReleaseNotes ChangeLog
-   dodoc doc/nedit.doc doc/NEdit.ad doc/faq.txt
-   dohtml doc/nedit.html
-}



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

2021-04-19 Thread Andreas K. Hüttel
commit: fcb824021229474835cd7268f71d24f1913a701c
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Apr 20 01:10:53 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue Apr 20 01:11:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb82402

package.mask: Make binutils mask more informative

Signed-off-by: Andreas K. Hüttel  gentoo.org>

 profiles/package.mask | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 650b7e451ed..81e8b894ef4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -66,7 +66,8 @@ dev-java/ezmorph
 dev-java/ical4j
 
 # Andreas K. Hüttel  (2021-04-18)
-# Broken, stay tuned
+# Do not use yet, may lead under certain circumstances to a
+# non-functional ld (bug 783777)
 =sys-devel/binutils-2.36*
 =sys-devel/binutils-hppa64-2.36*
 =sys-libs/binutils-libs-2.36*



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

2021-04-19 Thread Matthew Thode
commit: b084e99d5903afa9b75efac882476dc45908ce4c
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 01:04:47 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:04:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b084e99d

aapp-emulation/diskimage-builder: 3.10.0 bump

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-emulation/diskimage-builder/Manifest   |  1 +
 .../diskimage-builder-3.10.0.ebuild| 39 ++
 2 files changed, 40 insertions(+)

diff --git a/app-emulation/diskimage-builder/Manifest 
b/app-emulation/diskimage-builder/Manifest
index f3a79ef9388..b6570b705db 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -1,3 +1,4 @@
+DIST diskimage-builder-3.10.0.tar.gz 474514 BLAKE2B 
75e54b58be31a1d175ea97fd587040d2d8a69619fa66f7283866241c8a38b898c7e863b484be1199b61fe5fce76f51a4e5bf72d42fbd5d5456b1402501c337f0
 SHA512 
678718eb12e024899d0020c0219899e213a69a445afe3352a49a99dc786d7388e0af37c0fb1273eeb2176ad3b24f62f8299b4f15e9f7fc9714f03be3bf3b4f7c
 DIST diskimage-builder-3.7.0.tar.gz 472703 BLAKE2B 
4c3bf294f33556525f65d29e999cccaa4066d42f8e17742041666872ac01f5c6acab77d20b5d4281cc385a3f6988086e43c36f5330a656e5d2cb73c2e63e346d
 SHA512 
c4453840f043774446e8dcb88bdc841d2fee8fb60432168fe48048171896932f2be9048fb0af9c5b777978218ec51f24bdfd6484a8e6cbe7a195b6df2508a1e1
 DIST diskimage-builder-3.8.0.tar.gz 473795 BLAKE2B 
86ce05ac649ff0faef90d9dd6f2677d6cc609e2fa4613ab00b88f75b861e586650f4a74ea01d1fb68745581d043b0dc7d8f3c9e8437ee16003a34ffc617ab513
 SHA512 
f3e553746f77545cf6cfe7fad706000bfa9761878f4481bae5fe8d06118c2e0360a7af220e89fe3d65320a6a2ae8b4f4ae69259fa9455bebe8bae8b07acff455
 DIST diskimage-builder-3.9.0.tar.gz 473797 BLAKE2B 
79654b7d5673d084e81850be102174b509c43fc598b54455256309abe9e503db779be03a440cd5bc6c37fd890bba9412cd8850dfc2bf855f7d8bf69e1e26ee6e
 SHA512 
8be45bef3680b7a5c7aeb1a301a09ace26db51b4f842a7fdb19194a82cc3436e18296e9a3b88a75cfeccbd14e9098d6ad83f50ca44f7eaeba85accf4ef54e7da

diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild 
b/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild
new file mode 100644
index 000..4c39e9fb0b8
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.10.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder."
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/;
+if [[ ${PV} == * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git;
+else
+   SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+   !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+   >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+   !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+   >=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+   >=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+   >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+   >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+   app-emulation/qemu
+   sys-block/parted
+   sys-fs/multipath-tools
+   sys-fs/dosfstools
+   sys-apps/gptfdisk
+   !dev-python/dib-utils[${PYTHON_USEDEP}]"



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

2021-04-19 Thread Matthew Thode
commit: 10498d5a86f1b5404c84793d213facebfaecfcd6
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 00:59:17 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:02:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10498d5a

app-admin/puppetdb: 7.2.0 stable amd64/x86

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppetdb/puppetdb-7.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppetdb/puppetdb-7.2.0.ebuild 
b/app-admin/puppetdb/puppetdb-7.2.0.ebuild
index 78bd75a0264..06b2986213b 100644
--- a/app-admin/puppetdb/puppetdb-7.2.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz;
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb



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

2021-04-19 Thread Matthew Thode
commit: 2ce1bfa88447536c2f17cf4787249a8fdef6f277
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 01:00:40 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:02:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce1bfa8

dev-ruby/puppetdb-termini: 7.2.0 stable amd64/x86

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild 
b/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
index 57a8294eabe..e88438205f9 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.2.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""



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

2021-04-19 Thread Matthew Thode
commit: 8f25592dfdcd7cf3eb6b3ab7f6b58e9a35b9c4fc
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 00:57:39 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:02:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f25592d

app-admin/puppet: 7.5.0 stable amd64/x86

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppet/puppet-7.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppet/puppet-7.5.0.ebuild 
b/app-admin/puppet/puppet-7.5.0.ebuild
index d241ec554c3..65ed31b7def 100644
--- a/app-admin/puppet/puppet-7.5.0.ebuild
+++ b/app-admin/puppet/puppet-7.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz;
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 



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

2021-04-19 Thread Matthew Thode
commit: 15bce6c064c9b8f436e8272999303a7914ca6e6a
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 01:02:02 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:02:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15bce6c0

sys-cluster/neutron: 16.3.1 and 17.1.1 stable amd64/x86 with cleanup

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 sys-cluster/neutron/Manifest  |   6 -
 sys-cluster/neutron/neutron-16.3.0.ebuild | 230 --
 sys-cluster/neutron/neutron-16.3.1.ebuild |   2 +-
 sys-cluster/neutron/neutron-17.1.0.ebuild | 227 -
 sys-cluster/neutron/neutron-17.1.1.ebuild |   2 +-
 5 files changed, 2 insertions(+), 465 deletions(-)

diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 8dd5912aac6..af4bbaf86f8 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,16 +1,10 @@
-DIST neutron-16.3.0.tar.gz 12866714 BLAKE2B 
67436c96f52a6d1a60d8af13ce7d8d7b375def861ca83fddca0986649c7f2df6bae41763459feb2bba7e6cd16fab0c0c7ad970582be6d8798350efab11216a3d
 SHA512 
f1901b672925248e08a239fdaf4c691cfcae90d53858ab0eed46919464a2dad8d27e89c46fb47563744e2a569995f5fbc540c8b69eef0273d6a605ea13ef5051
 DIST neutron-16.3.1.tar.gz 12880968 BLAKE2B 
2915490523578f10f067682ad393c06bc7f793a736f94282e79e82e4f0108fa20a99d8a91f4344094de394316a71c4a5fdd2995db212ddd90fd7cdeddd00787b
 SHA512 
8518f706d4bcb4bf44e2ef9b35b858f08f2e7ac20211944ca0d4df6e2be029817bc541f2fff497bd40b4a85621ee4aa8ac433fbdd19a5d8597df0725a377ae91
-DIST neutron-17.1.0.tar.gz 12910659 BLAKE2B 
30634389e9caf77e7bc36b61f26c8ff24013171f1dc0cef52e2ebb55363b526bb6146a578e21c027ef6902f8881985c5a06d4d0b98992e13720a8118cd876b05
 SHA512 
62bd2691878c93f9c51adfecf7f7aa6fbb51485a259a419e9797738626fb2527c167ea568cd54f5fdc60a5210c53fafb2b754817123742b27150ed1cfbffca2b
 DIST neutron-17.1.1.tar.gz 12925243 BLAKE2B 
f95068d1a85a508e447fc5de28ef6555252fdfe3deb8b0dd94a2e20f28663dc610bbb5e32fb69e0d80fbe9917c387b0c095fb43370ddfe2bbb05327553cb8e58
 SHA512 
cd707d4adaa6a6b606940370606fcef61a35af0d1f1108f24891d2f88611f4f2812c061d3b7a9540d4b6df882615a9366d39273184a791a911775e7c9f4402b8
-DIST neutron-configs-16.3.0.tar.gz 24350 BLAKE2B 
8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099
 SHA512 
b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-16.3.1.tar.gz 24350 BLAKE2B 
8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099
 SHA512 
b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
-DIST neutron-configs-17.1.0.tar.gz 30314 BLAKE2B 
885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6
 SHA512 
cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-configs-17.1.1.tar.gz 30314 BLAKE2B 
885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6
 SHA512 
cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
 DIST neutron-configs-2020.1..tar.gz 24350 BLAKE2B 
8f6eeae762fa297651f07667387beac6677cfa9a6c0d13d3fc90ac09753022fd284fc56c53557ab83cda99ab4fe03acc2d2049e4bb62f9496b310b1cd6f42099
 SHA512 
b087b23a1aa19678d4b9a76ae82243d03fe82706712e8c37b759a8521062f79e83307769b4ba639f67aa402f8b03cdf12d3274d821c3f8ecfd17ded9f4f2c881
 DIST neutron-configs-2020.2..tar.gz 30314 BLAKE2B 
885d00259fde0200f6a52d91b18e884012c04cb06e5e4ba6c72b77fbb0a8df30d50efd6db16faa009328eac9b7c5fb31854feb81595a542b4ac5d8172c8056b6
 SHA512 
cf85a563c417e1fb01f7d329c7021c20782fe67f64c5dfd542deed07e09d6a717e472976df8f1f4c3bb4a6a10e8d8b8300f18e1a3759358b3db12f77dad7bd5b
-DIST neutron-ml2-plugins-16.3.0.tar.gz 8887 BLAKE2B 
5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4
 SHA512 
4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
 DIST neutron-ml2-plugins-16.3.1.tar.gz 8887 BLAKE2B 
5887027ce4585a523bb3379c002acdde1faa9ed24d0c83c931f2a387b56e8baf8352ae9f82ba46c85a6a3e5b1d68792da1e1ca1fae9b6dde525e6f6c67849ac4
 SHA512 
4ae70fe3e386932e0327333d29dc526b5f0f0f800ac14d17faa4c1e3fc2dd8524760b84bbb4767e73e70647984aa50702e5e47dc42deb47f66c47c5e3e965111
-DIST neutron-ml2-plugins-17.1.0.tar.gz 9011 BLAKE2B 

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

2021-04-19 Thread Matthew Thode
commit: f109f77786a4c8c3d135bc65f3860c01dbe99e9a
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 00:59:52 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:02:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f109f777

app-admin/puppetserver: 7.1.0 stable amd64

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppetserver/puppetserver-7.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppetserver/puppetserver-7.1.0.ebuild 
b/app-admin/puppetserver/puppetserver-7.1.0.ebuild
index 0cf80aca0ef..4d5a6144923 100644
--- a/app-admin/puppetserver/puppetserver-7.1.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.1.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
>=virtual/jdk-1.8.0



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

2021-04-19 Thread Matthew Thode
commit: 700213b35083ded887df71bc6bde40c474cd4375
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Apr 20 00:58:41 2021 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Tue Apr 20 01:02:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700213b3

app-admin/puppet-agent: 7.5.0 stable amd64

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppet-agent/puppet-agent-7.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild 
b/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild
index 4a86bc59357..b9cc527c311 100644
--- a/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.5.0.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 



[gentoo-commits] repo/gentoo:master commit in: dev-util/bpftrace/files/, dev-util/bpftrace/

2021-04-19 Thread Patrick McLean
commit: 86cdb30121712b13ba63c7f44019e70658a4e278
Author: Patrick McLean  sony  com>
AuthorDate: Mon Apr 19 23:49:47 2021 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Mon Apr 19 23:49:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86cdb301

dev-util/bpftrace-0.12.1: Version bump

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Patrick McLean  gentoo.org>

 dev-util/bpftrace/Manifest |   1 +
 dev-util/bpftrace/bpftrace-0.12.1.ebuild   |  89 
 .../files/bpftrace-0.12.0-fuzzing-build.patch  |  13 ++
 .../files/bpftrace-0.12.0-install-libs.patch   | 160 +
 dev-util/bpftrace/metadata.xml |   3 +
 5 files changed, 266 insertions(+)

diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 786d756a582..babfffac440 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1 +1,2 @@
 DIST bpftrace-0.11.4.tar.gz 868016 BLAKE2B 
50af7b4094e2875905d1ca36c003cde84e51adb11360f7933b82cd004dd7b9a8c2146d11c1422411ec0bb1935a693b17ab6d405aa5569ecabccfc21cdd1ca548
 SHA512 
611a7e61dbd1f4cc52b7e51a1a143296ff7b2df115b3a28034c674d8eefb5d482cac551ab82d6b7cc2f6fc0668b07d2d9e283dff371fd9a3f649c80113fdca82
+DIST bpftrace-0.12.1.tar.gz 938043 BLAKE2B 
3599c21d2381265ab5a7a3c0bf142dc7f79acb66fbb4f54b4100d042c21fc3c9e86297522bfe46f82ad5edbc2203314a6b02ff7cc07552c778b0726e681cb993
 SHA512 
a578499668bd2eb7342689b6c0ef3db6ca263a971d8e6f1b9a68c502c27170d24ede212a0fc2a72263e72aff58924f488a5c80d447397503a08512dc47b63345

diff --git a/dev-util/bpftrace/bpftrace-0.12.1.ebuild 
b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
new file mode 100644
index 000..cd944547539
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.12.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace;
+
+if [[ ${PV} =~ 9{4,} ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/iovisor/${PN};
+   BDEPEND=""
+else
+   MY_PV="${PV//_/}"
+   SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="fuzzing test"
+
+COMMON_DEPEND="
+   dev-libs/libbpf:=
+   >=dev-util/bcc-0.13.0:=
+   dev-util/systemtap
+   >=sys-devel/llvm-6:=[llvm_targets_BPF(+)]
+   <=sys-devel/llvm-13:=[llvm_targets_BPF(+)]
+   <=sys-devel/clang-13:=
+   sys-libs/binutils-libs:=
+   virtual/libelf
+"
+DEPEND="${COMMON_DEPEND}
+   test? ( dev-cpp/gtest )
+"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="
+   >=dev-util/cmake-3.8
+   sys-devel/flex
+   sys-devel/bison
+"
+
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+   "${FILESDIR}/bpftrace-0.12.0-install-libs.patch"
+   "${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
+   "${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+   "${FILESDIR}/bpftrace-0.12.0-fuzzing-build.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+pkg_pretend() {
+   local CONFIG_CHECK="
+   ~BPF
+   ~BPF_EVENTS
+   ~BPF_JIT
+   ~BPF_SYSCALL
+   ~FTRACE_SYSCALLS
+   ~HAVE_EBPF_JIT
+   "
+
+   check_extra_config
+}
+
+pkg_setup() {
+   LLVM_MAX_SLOT=12 llvm_pkg_setup
+}
+
+src_prepare() {
+   cmake_src_prepare
+}
+
+src_configure() {
+   local -a mycmakeargs=(
+   -DSTATIC_LINKING:BOOL=OFF
+   -DBUILD_TESTING:BOOL=OFF
+   -DBUILD_FUZZ:BOOL=$(usex fuzzing)
+   -DUSE_LIBFUZZER:BOOL=$(usex libfuzzer)
+   )
+
+   cmake_src_configure
+}

diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch 
b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
new file mode 100644
index 000..30f03eb8ff2
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.12.0-fuzzing-build.patch
@@ -0,0 +1,13 @@
+diff --git a/src/fuzz_main.cpp b/src/fuzz_main.cpp
+index a08d0b03..82127be0 100644
+--- a/src/fuzz_main.cpp
 b/src/fuzz_main.cpp
+@@ -135,7 +135,7 @@ int fuzz_main(const char* data, size_t sz)
+ struct utsname utsname;
+ uname();
+ std::string ksrc, kobj;
+-auto kdirs = get_kernel_dirs(utsname, !bpftrace.features_->has_btf());
++auto kdirs = get_kernel_dirs(utsname, !bpftrace.feature_->has_btf());
+ ksrc = std::get<0>(kdirs);
+ kobj = std::get<1>(kdirs);
+ 

diff --git a/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch 
b/dev-util/bpftrace/files/bpftrace-0.12.0-install-libs.patch
new file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: dev-util/poke/

2021-04-19 Thread Sergei Trofimovich
commit: 87fd888b4494bfd57653a0ea49e5f1e1d76f015d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Apr 19 23:40:55 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Apr 19 23:41:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87fd888b

dev-util/poke: bump up to 1.2

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-util/poke/Manifest|  1 +
 dev-util/poke/poke-1.2.ebuild | 51 +++
 2 files changed, 52 insertions(+)

diff --git a/dev-util/poke/Manifest b/dev-util/poke/Manifest
index 51699f74380..306cbaa13e5 100644
--- a/dev-util/poke/Manifest
+++ b/dev-util/poke/Manifest
@@ -1 +1,2 @@
 DIST poke-1.1.tar.gz 6754840 BLAKE2B 
bc7c8562ee918dec3d40219bf3d02220b9ec4934c816620c69d987446375bf69036dda12a91115404b9beed02200262429080320a66e7cc2358eba63a48d5b8d
 SHA512 
ffcc7be254c326947b5e20bb8d659f6d0396bcef6fea8da1b47106dce1670703730d365a5090bfc2c31cf29c1cc7a3c6ad1b5d4022a1ebe1adbe43a33ff45baa
+DIST poke-1.2.tar.gz 6772669 BLAKE2B 
9b3c8c425145be7c93c32f7931f7aba04ae3704920603f8301b8af31cce49ae12c83a697e74f7cec803508bfd165b7bbb1c5a859ce95a791d291528c31b24245
 SHA512 
70a4b8749ca53e255df76ca32cc401ba58d5bea2ee1c01730dadfb1d76a6c286f44137805c801e0f1e520c59306568a87efe56d44175ec0510954f97b640d331

diff --git a/dev-util/poke/poke-1.2.ebuild b/dev-util/poke/poke-1.2.ebuild
new file mode 100644
index 000..3683b23922d
--- /dev/null
+++ b/dev-util/poke/poke-1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="extensible editor for structured binary data"
+HOMEPAGE="http://www.jemarch.net/poke;
+
+SRC_URI="mirror://gnu/poke/${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="machine-interface nls static-libs test"
+
+RESTRICT="!test? ( test )"
+
+# TODO: libnbd: not packaged in gentoo yet
+# TODO: gui: does not seem to do anything :)
+RDEPEND="
+   dev-libs/boehm-gc:=
+   sys-devel/gettext
+   sys-libs/readline:=
+   machine-interface? ( dev-libs/json-c:= )
+"
+DEPEND="${RDEPEND}
+   test? ( dev-util/dejagnu )
+"
+BDEPEND="
+   sys-devel/flex
+   sys-devel/bison
+   sys-apps/help2man
+   virtual/pkgconfig
+"
+
+src_configure() {
+   econf \
+   --disable-gui \
+   --disable-libnbd \
+   $(use_enable machine-interface mi) \
+   $(use_enable nls) \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+
+   if ! use static-libs; then
+   find "${ED}" -name '*.la' -delete || die
+   fi
+}



[gentoo-commits] repo/proj/guru:dev commit in: dev-ruby/pry-byebug/

2021-04-19 Thread Alessandro Barbieri
commit: 986d0eb512ca01d7e77dcdcbf7af38887637522b
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 19 23:00:32 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 19 23:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=986d0eb5

dev-ruby/pry-byebug: new package

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-ruby/pry-byebug/Manifest|  1 +
 dev-ruby/pry-byebug/metadata.xml| 12 
 dev-ruby/pry-byebug/pry-byebug-3.9.0.ebuild | 30 +
 3 files changed, 43 insertions(+)

diff --git a/dev-ruby/pry-byebug/Manifest b/dev-ruby/pry-byebug/Manifest
new file mode 100644
index 0..9b5fc3258
--- /dev/null
+++ b/dev-ruby/pry-byebug/Manifest
@@ -0,0 +1 @@
+DIST pry-byebug-3.9.0.gem 15872 BLAKE2B 
a2f1e4b2fb130450e2dfea2fd18d1839d053ad5d155d304df9bdc56b934e8d0c89964139c786cef7a879d59caece2dfba7aaa20f9d9812da32824597c03564fd
 SHA512 
5883e922a40d0639b112601b8a49f3cd735342d2e2173b85d1e207a79ac6f45441881bed8ea429caa5934d0754a1987e6d8ee332975ad437c98bffb92948c592

diff --git a/dev-ruby/pry-byebug/metadata.xml b/dev-ruby/pry-byebug/metadata.xml
new file mode 100644
index 0..524efc1b6
--- /dev/null
+++ b/dev-ruby/pry-byebug/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+
https://github.com/deivid-rodriguez/pry-byebug/issues
+deivid-rodriguez/pry-byebug
+
+

diff --git a/dev-ruby/pry-byebug/pry-byebug-3.9.0.ebuild 
b/dev-ruby/pry-byebug/pry-byebug-3.9.0.ebuild
new file mode 100644
index 0..ce42f5220
--- /dev/null
+++ b/dev-ruby/pry-byebug/pry-byebug-3.9.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby30 ruby27 ruby26 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Step-by-step debugging and stack navigation in Pry"
+HOMEPAGE="https://github.com/deivid-rodriguez/pry-byebug;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+#ruby_add_bdepend ""
+
+ruby_add_rdepend "
+   >=dev-ruby/byebug-11.0
+   >=dev-ruby/pry-0.13
+   

[gentoo-commits] repo/proj/guru:dev commit in: app-shells/zsh-autosuggestions/

2021-04-19 Thread Alessandro Barbieri
commit: e0fa89217531194a60c0791b27493c6787273cb5
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 19 23:32:09 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 19 23:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e0fa8921

app-shells/zsh-autosuggestions: tentative changes for tests

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 .../zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild 
b/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild
index 50f7d1f5c..7eceae128 100644
--- a/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild
+++ b/app-shells/zsh-autosuggestions/zsh-autosuggestions-0.6.4.ebuild
@@ -3,6 +3,11 @@
 
 EAPI=7
 
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
 DESCRIPTION="Fish-like autosuggestions for zsh"
 HOMEPAGE="https://github.com/zsh-users/zsh-autosuggestions;
 
SRC_URI="https://github.com/zsh-users/zsh-autosuggestions/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
@@ -11,15 +16,16 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
-#RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test )"
 #test need byebug not packaged
-RESTRICT="test"
+#RESTRICT="test"
 RDEPEND=">=app-shells/zsh-4.3.11"
 BDEPEND="
test? (
${RDEPEND}
dev-ruby/bundler
-   dev-ruby/rspec
+   dev-ruby/pry-byebug
+   dev-ruby/rspec-wait
)
 "
 DEPEND=""



[gentoo-commits] repo/proj/guru:dev commit in: dev-ruby/byebug/

2021-04-19 Thread Alessandro Barbieri
commit: 3a8ea9e441af02925a792a3fd33cb917d61d15ab
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 19 22:30:16 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 19 23:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a8ea9e4

dev-ruby/byebug: new package

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-ruby/byebug/Manifest |  1 +
 dev-ruby/byebug/byebug-11.1.3.ebuild | 42 
 dev-ruby/byebug/metadata.xml | 12 +++
 3 files changed, 55 insertions(+)

diff --git a/dev-ruby/byebug/Manifest b/dev-ruby/byebug/Manifest
new file mode 100644
index 0..a4fe27d96
--- /dev/null
+++ b/dev-ruby/byebug/Manifest
@@ -0,0 +1 @@
+DIST byebug-11.1.3.tar.gz 131063 BLAKE2B 
fe83aade01b520378e3cf62cb21324eb876748294c0c7402ae8eb215bdaa94f5d34056c5505de48a94f6a87546afd96a8b08c541d72b35f1f263fce9d85b4797
 SHA512 
9f00697e2c953d7b8da09fa6da442c34dd3713b823b5dd0074e6998662d361d88a37ca4c530d9cbfeab8605dfb0eb7f95422c66f2c5f1d90080dd7aefc302952

diff --git a/dev-ruby/byebug/byebug-11.1.3.ebuild 
b/dev-ruby/byebug/byebug-11.1.3.ebuild
new file mode 100644
index 0..8c7ee80eb
--- /dev/null
+++ b/dev-ruby/byebug/byebug-11.1.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md GUIDE.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/byebug/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/byebug
+
+inherit ruby-fakegem
+
+DESCRIPTION="a Ruby 2 debugger"
+HOMEPAGE="https://github.com/deivid-rodriguez/byebug;
+SRC_URI="https://github.com/deivid-rodriguez/byebug/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# Tests require bundler and hang when run from portage
+RESTRICT="test"
+
+ruby_add_bdepend "test? (
+   dev-ruby/byebug
+   dev-ruby/pry
+)"
+
+all_ruby_prepare() {
+   sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+   sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+   NOCOV=true ${RUBY} -r./test/minitest_runner -e 
Byebug::MinitestRunner.new.run || die
+}

diff --git a/dev-ruby/byebug/metadata.xml b/dev-ruby/byebug/metadata.xml
new file mode 100644
index 0..bfd4899e8
--- /dev/null
+++ b/dev-ruby/byebug/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   lssndrbarbi...@gmail.com
+   Alessandro Barbieri
+   
+   
+   
https://github.com/deivid-rodriguez/byebug/issues
+   deivid-rodriguez/byebug
+   
+



[gentoo-commits] repo/proj/guru:dev commit in: dev-ruby/byebug/

2021-04-19 Thread Alessandro Barbieri
commit: a41bdfb16af7f123b9e89e750e21ab1f32189a1c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 19 22:56:51 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 19 23:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a41bdfb1

dev-ruby/byebug: add ruby30

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-ruby/byebug/byebug-11.1.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/byebug/byebug-11.1.3.ebuild 
b/dev-ruby/byebug/byebug-11.1.3.ebuild
index 8c7ee80eb..b2cd0a380 100644
--- a/dev-ruby/byebug/byebug-11.1.3.ebuild
+++ b/dev-ruby/byebug/byebug-11.1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md GUIDE.md README.md"
 



[gentoo-commits] repo/proj/guru:dev commit in: dev-ruby/rspec-wait/

2021-04-19 Thread Alessandro Barbieri
commit: 01c080e24b5be6bf10e9799c0279ba2bba949bd6
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Apr 19 22:54:03 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Apr 19 23:32:33 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=01c080e2

dev-ruby/rspec-wait: new package

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 dev-ruby/rspec-wait/Manifest|  1 +
 dev-ruby/rspec-wait/metadata.xml| 12 
 dev-ruby/rspec-wait/rspec-wait-0.0.9.ebuild | 26 ++
 3 files changed, 39 insertions(+)

diff --git a/dev-ruby/rspec-wait/Manifest b/dev-ruby/rspec-wait/Manifest
new file mode 100644
index 0..938786fdc
--- /dev/null
+++ b/dev-ruby/rspec-wait/Manifest
@@ -0,0 +1 @@
+DIST rspec-wait-0.0.9.gem 11264 BLAKE2B 
04a764cfb417690dceee735dc014d893c74ca94980400bd097c9150313dedc646a52bfaf80187769c3f6baf5b7319bad6ab6b85afaaf013b25f5d2d52d9cde86
 SHA512 
4bb4b01c26fbc14d211e24b08a0a79a47e73428bafb11e6fb0c91cf1c890dff284059cc1ea350342eda4196577e5bab14c08991c66ec1a01cf4f88810671a117

diff --git a/dev-ruby/rspec-wait/metadata.xml b/dev-ruby/rspec-wait/metadata.xml
new file mode 100644
index 0..e09fffe58
--- /dev/null
+++ b/dev-ruby/rspec-wait/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+lssndrbarbi...@gmail.com
+Alessandro Barbieri
+
+
+https://github.com/laserlemon/rspec-wait/issues
+laserlemon/rspec-wait
+
+

diff --git a/dev-ruby/rspec-wait/rspec-wait-0.0.9.ebuild 
b/dev-ruby/rspec-wait/rspec-wait-0.0.9.ebuild
new file mode 100644
index 0..8a347243c
--- /dev/null
+++ b/dev-ruby/rspec-wait/rspec-wait-0.0.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby30 ruby27 ruby26 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC=""
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_GEMSPEC="rspec-wait.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="enables time-resilient expectations in your RSpec test suite"
+HOMEPAGE="https://github.com/laserlemon/rspec-wait;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+   >=dev-ruby/rspec-3
+"



[gentoo-commits] repo/gentoo:master commit in: app-backup/restic/

2021-04-19 Thread Sam James
commit: 9959b6d2d2d18d328faf846bd2add48e346a6b23
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 23:11:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 23:11:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9959b6d2

app-backup/restic: fix WhitespaceFound

Signed-off-by: Sam James  gentoo.org>

 app-backup/restic/restic-0.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-backup/restic/restic-0.12.0.ebuild 
b/app-backup/restic/restic-0.12.0.ebuild
index 4ae0b29ee88..2f9ae425235 100644
--- a/app-backup/restic/restic-0.12.0.ebuild
+++ b/app-backup/restic/restic-0.12.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A backup program that is fast, efficient and 
secure"
 HOMEPAGE="https://restic.github.io/;
 
 EGO_SUM=(
-"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512"
+   "bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512"
"bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod"
"cloud.google.com/go v0.26.0/go.mod"
"cloud.google.com/go v0.34.0/go.mod"



[gentoo-commits] repo/gentoo:master commit in: media-radio/xlog/

2021-04-19 Thread Sam James
commit: bf3762e5bc162027cfc84de867c1a769b410b9b7
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 23:11:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 23:11:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf3762e5

media-radio/xlog: fix WhitespaceFound

Signed-off-by: Sam James  gentoo.org>

 media-radio/xlog/xlog-2.0.22.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-radio/xlog/xlog-2.0.22.ebuild 
b/media-radio/xlog/xlog-2.0.22.ebuild
index 93e80f3e0ef..b3ac50566f6 100644
--- a/media-radio/xlog/xlog-2.0.22.ebuild
+++ b/media-radio/xlog/xlog-2.0.22.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 
 src_install() {
emake DESTDIR="${D}" install
-   # build system makes it complicate to inhibit updating desktop 
+   # build system makes it complicate to inhibit updating desktop
# database, so just remove the offending file
rm  "${D}"/usr/share/applications/mimeinfo.cache || die
docompress -x /usr/share/doc/${PF}/{KEYS,ChangeLog,TODO,BUGS}



[gentoo-commits] repo/gentoo:master commit in: x11-themes/gartoon-redux/

2021-04-19 Thread Sam James
commit: 1a467a47ccffb07ae561838920160eb601a1db5c
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 23:08:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 23:08:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a467a47

x11-themes/gartoon-redux: drop blank line in pkg_preinst

Signed-off-by: Sam James  gentoo.org>

 x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild 
b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
index 9d96533afe7..e4b5163588b 100644
--- a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
+++ b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
@@ -43,7 +43,6 @@ src_install() {
 
 pkg_preinst() {
gnome2_icon_savelist
-
 }
 
 pkg_postinst() {



[gentoo-commits] repo/gentoo:master commit in: www-client/netrik/files/, www-client/netrik/

2021-04-19 Thread Sam James
commit: cb57c93e9c101cc219890e3aa2aa59c9f7423646
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:55:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:55:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb57c93e

www-client/netrik: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 www-client/netrik/files/netrik-1.16.1-configure.patch |  4 ++--
 .../netrik/files/netrik-1.16.1-ncurses-tinfo.patch|  4 ++--
 www-client/netrik/netrik-1.16.1-r1.ebuild | 19 +++
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/www-client/netrik/files/netrik-1.16.1-configure.patch 
b/www-client/netrik/files/netrik-1.16.1-configure.patch
index 45a0368d69d..c4b24b710ff 100644
--- a/www-client/netrik/files/netrik-1.16.1-configure.patch
+++ b/www-client/netrik/files/netrik-1.16.1-configure.patch
@@ -1,5 +1,5 @@
 configure.ac.orig  2013-04-12 08:56:35.279744148 +0400
-+++ configure.ac   2013-04-12 08:57:09.576747084 +0400
+--- a/configure.ac
 b/configure.ac
 @@ -1,6 +1,3 @@
 -dnl preserve initial CFLAGS
 -CFLAGS_OLD="$CFLAGS"

diff --git a/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch 
b/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch
index 193b0af5cd0..5ed1b449bfc 100644
--- a/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch
+++ b/www-client/netrik/files/netrik-1.16.1-ncurses-tinfo.patch
@@ -1,5 +1,5 @@
 configure.ac.orig  2013-04-10 13:39:02.514339066 +0400
-+++ configure.ac   2013-04-10 13:39:28.607341140 +0400
+--- a/configure.ac
 b/configure.ac
 @@ -18,8 +18,9 @@
  AC_HEADER_STDC
  

diff --git a/www-client/netrik/netrik-1.16.1-r1.ebuild 
b/www-client/netrik/netrik-1.16.1-r1.ebuild
index c9110df5ca5..039318f9d3e 100644
--- a/www-client/netrik/netrik-1.16.1-r1.ebuild
+++ b/www-client/netrik/netrik-1.16.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools epatch
+inherit autotools
 
 DESCRIPTION="A text based web browser with no ssl support"
 HOMEPAGE="http://netrik.sourceforge.net/;
@@ -17,7 +17,15 @@ RDEPEND=">=sys-libs/ncurses-5.1[unicode]
sys-libs/readline"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   # bug #459660
+   "${FILESDIR}"/${P}-ncurses-tinfo.patch
+   "${FILESDIR}"/${P}-configure.patch
+)
+
 src_prepare() {
+   default
+
sed -i -e "/^doc_DATA/s/COPYING LICENSE //" \
Makefile.am || die 'sed on Makefile.am failed'
 
@@ -25,14 +33,9 @@ src_prepare() {
sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
configure.ac || die 'sed on configure.ac failed'
 
-   # bug #459660
-   epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
-   epatch "${FILESDIR}/${P}-configure.patch"
-   epatch_user
-
eautoreconf
 }
 
 src_install() {
-   emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+   emake DESTDIR="${D}" docdir="${EPREFIX}"/usr/share/doc/${PF} install
 }



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

2021-04-19 Thread Sam James
commit: 2979250b615aa3f58a6e780cab54dd83eaa53fd2
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:47:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:55:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2979250b

app-crypt/signify: drop 23, 24, 29

Signed-off-by: Sam James  gentoo.org>

 app-crypt/signify/Manifest  |  3 ---
 app-crypt/signify/signify-23.ebuild | 24 
 app-crypt/signify/signify-24.ebuild | 24 
 app-crypt/signify/signify-29.ebuild | 27 ---
 4 files changed, 78 deletions(-)

diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 052c0771236..89e1cd2d5f0 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,4 +1 @@
-DIST signify-23.tar.gz 95335 BLAKE2B 
4cdbee5dae7f217644a5df41d4253938c5cb8fb1f621f945addfceb64090234199e8dd81d7ef42c41aae13e9e5158541f40062296ca07562977473e39f68cd0b
 SHA512 
f0330994f3d308e9ad7c7bf4b6d6f8e8bef914d6d10d83507002ad97f853b4e0a829997a0225373e2c34829a611b70980d7d3674247d4b5b447204ad7f039608
-DIST signify-24.tar.gz 92038 BLAKE2B 
4d9413a423534fb4f9adfb50494802b737e6099b47933eed9686ba751f7ffb6999b084c5a5431652a33baab11d7384e762c4709bab52bb0de4694a885c8eb570
 SHA512 
d612aca617f44ea7bf32a31d65da7e265dfdbe67f7983fc095b1f2d5c83cfa27f4c857279d98f6928199d15193c706cf3c77022fec70529a7b5d38b16ce64df5
-DIST signify-29.tar.gz 94553 BLAKE2B 
eba286618c5ea9fb9515c44330297276504009078a09d7b36c208225e4fd33e014623829dd582ededc2f35f207058ad2c93412ad006852966c37466ed87e7b9a
 SHA512 
a0fc07c176f3e0e6ea32d059fb6cc27849159dcc3975c47b2b0a54f7047cb1f1dc0e032f2c55eaf84096b0a84288193afec0777e669851a7c7f97a880fb0f0ab
 DIST signify-30.tar.gz 94593 BLAKE2B 
2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3
 SHA512 
4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87

diff --git a/app-crypt/signify/signify-23.ebuild 
b/app-crypt/signify/signify-23.ebuild
deleted file mode 100644
index 8fe56566211..000
--- a/app-crypt/signify/signify-23.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Cryptographically sign and verify files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify;
-SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/libbsd-0.7"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   tc-export CC
-}
-
-src_install() {
-   DESTDIR="${D}" PREFIX="/usr" emake install
-}

diff --git a/app-crypt/signify/signify-24.ebuild 
b/app-crypt/signify/signify-24.ebuild
deleted file mode 100644
index cff3a751895..000
--- a/app-crypt/signify/signify-24.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Cryptographically sign and verify files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify;
-SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-libs/libbsd-0.7"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   tc-export CC
-}
-
-src_install() {
-   DESTDIR="${D}" PREFIX="/usr" emake install
-}

diff --git a/app-crypt/signify/signify-29.ebuild 
b/app-crypt/signify/signify-29.ebuild
deleted file mode 100644
index 142c2f147c6..000
--- a/app-crypt/signify/signify-29.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="OpenBSD tool to sign and verify signatures on files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify;
-SRC_URI="https://github.com/aperezdc/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/libbsd-0.8"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   tc-export CC
-   default
-}
-
-src_install() {
-   dobin signify
-   doman signify.1
-}



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

2021-04-19 Thread Sam James
commit: cec2af58b85b7b64860c87d295f3f36333290842
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:48:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:55:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cec2af58

sys-apps/toybox: drop 0.8.0, 0.8.1, 0.8.3

Signed-off-by: Sam James  gentoo.org>

 sys-apps/toybox/Manifest|  3 --
 sys-apps/toybox/toybox-0.8.0.ebuild | 56 -
 sys-apps/toybox/toybox-0.8.1.ebuild | 56 -
 sys-apps/toybox/toybox-0.8.3.ebuild | 56 -
 4 files changed, 171 deletions(-)

diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 94ad70b1f9e..80755ef0224 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,4 +1 @@
-DIST toybox-0.8.0.tar.gz 975002 BLAKE2B 
e137c3616d2affaf8b6f234cab49190b98540fe8f954244172f9ca80c749069f85ff8addd94e1018d3680f1a307df54671ee9b01726c5279f340f8fee3669609
 SHA512 
aeb15a02782cc0b3b46a892e2d82834e5172a7da04e2498eaefec58221305dd24a86aada5ce05978bd4694895ffeb94ae980fd767f4ee00c499b3dd518fd3e20
-DIST toybox-0.8.1.tar.gz 1015363 BLAKE2B 
a765a133910b7c8d903a1fa95338b8dee1267c3b7430267d47c4157d966256d16c615500acc38428296b9612649fafdaa111a149df7415ac580c01cfdd361025
 SHA512 
22f91046c75f986e44927ec89feab6c6afa1f614e5b0eae73e43f6ccd5c4328991ad283858fb1a5cb4d697806f38b8ab81782c160860a2c34ecbef3885636d5e
-DIST toybox-0.8.3.tar.gz 1098057 BLAKE2B 
d962c4fd1c79229ace5a0836b6170e3ce8a5435df660b5306f5dd0aab32f4509b5c3cf5cc87eea597d336c7cdd51ca4895cadd420febeb9ef9270e85909f8dec
 SHA512 
e2c5a22547cbd85bfee84c4aed3016895e4e0eba9b6f3dfc6cdfa0a0d59dfd74203a35389dcd0b2c557dd04eebbb051f9a458762af3abb32b473bd8924ed7b74
 DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B 
adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69
 SHA512 
507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8

diff --git a/sys-apps/toybox/toybox-0.8.0.ebuild 
b/sys-apps/toybox/toybox-0.8.0.ebuild
deleted file mode 100644
index bf8ce8e2d4f..000
--- a/sys-apps/toybox/toybox-0.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/landley/toybox.git;
-else
-   SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/;
-
-LICENSE="0BSD"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-   default
-   restore_config .config
-}
-
-src_configure() {
-   if [ -f .config ]; then
-   yes "" | emake -j1 oldconfig > /dev/null
-   return 0
-   else
-   einfo "Could not locate user configfile, so we will save a 
default one"
-   emake -j1 defconfig > /dev/null
-   fi
-}
-
-src_compile() {
-   tc-export CC STRIP
-   export HOSTCC=$(tc-getBUILD_CC)
-   unset CROSS_COMPILE
-   export CPUS=$(makeopts_jobs)
-   emake V=1
-}
-
-src_test() {
-   emake test
-}
-
-src_install() {
-   save_config .config
-   newbin generated/unstripped/toybox toybox
-}

diff --git a/sys-apps/toybox/toybox-0.8.1.ebuild 
b/sys-apps/toybox/toybox-0.8.1.ebuild
deleted file mode 100644
index 6c04f2330f3..000
--- a/sys-apps/toybox/toybox-0.8.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit multiprocessing savedconfig toolchain-funcs
-
-if [[ ${PV} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/landley/toybox.git;
-else
-   SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz;
-   KEYWORDS="~amd64 ~x86"
-fi
-
-# makefile is stupid
-RESTRICT="test"
-
-DESCRIPTION="Common linux commands in a multicall binary"
-HOMEPAGE="https://landley.net/code/toybox/;
-
-LICENSE="0BSD"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-   default
-   restore_config .config
-}
-
-src_configure() {
-   tc-export CC STRIP
-   export HOSTCC="$(tc-getBUILD_CC)"
-   if [ -f .config ]; then
-   yes "" | emake -j1 oldconfig > /dev/null
-   return 0
-   else
-   einfo "Could not locate user configfile, so we will save a 
default one"
-   emake -j1 defconfig > /dev/null
-   fi
-}
-
-src_compile() {
-   unset CROSS_COMPILE
-   export CPUS=$(makeopts_jobs)
-   emake V=1
-}
-
-src_test() {
-   emake test
-}
-
-src_install() {
-

[gentoo-commits] repo/gentoo:master commit in: app-vim/genutils/

2021-04-19 Thread Sam James
commit: 7e34683428cd1fdc5148103debc9d02eba0dea89
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:59:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e346834

app-vim/genutils: drop 2.5

Signed-off-by: Sam James  gentoo.org>

 app-vim/genutils/genutils-2.5.ebuild | 21 -
 1 file changed, 21 deletions(-)

diff --git a/app-vim/genutils/genutils-2.5.ebuild 
b/app-vim/genutils/genutils-2.5.ebuild
deleted file mode 100644
index a34145df707..000
--- a/app-vim/genutils/genutils-2.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: library with various useful functions"
-HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197;
-SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> 
${P}.zip"
-
-LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides library functions and is not intended to be used
-directly by the user."
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}



[gentoo-commits] repo/gentoo:master commit in: app-vim/taglist/files/, app-vim/taglist/

2021-04-19 Thread Sam James
commit: f98195b7acbaabf1c29e1932ed2fbbeea1df870a
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:09:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f98195b7

app-vim/taglist: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-vim/taglist/files/taglist-3.4-ebuilds.patch |  4 ++--
 app-vim/taglist/taglist-4.6.ebuild  | 11 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app-vim/taglist/files/taglist-3.4-ebuilds.patch 
b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
index 8fcc928d449..51b1a2435e5 100644
--- a/app-vim/taglist/files/taglist-3.4-ebuilds.patch
+++ b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
@@ -1,5 +1,5 @@
 taglist-3.4/plugin/taglist.vim.orig2004-10-02 00:12:58.400215576 
+0100
-+++ taglist-3.4/plugin/taglist.vim 2004-10-02 00:26:28.535056360 +0100
+--- a/plugin/taglist.vim
 b/plugin/taglist.vim
 @@ -205,6 +205,9 @@
  let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
 \ 'P:program;s:section'

diff --git a/app-vim/taglist/taglist-4.6.ebuild 
b/app-vim/taglist/taglist-4.6.ebuild
index 9d03fdf679f..80f6a853fdd 100644
--- a/app-vim/taglist/taglist-4.6.ebuild
+++ b/app-vim/taglist/taglist-4.6.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit vim-plugin epatch
+inherit vim-plugin
 
 DESCRIPTION="vim plugin: ctags-based source code browser"
 HOMEPAGE="http://vim-taglist.sourceforge.net/;
+
 LICENSE="vim"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~sparc-solaris"
 
@@ -14,6 +15,6 @@ RDEPEND="dev-util/ctags"
 
 VIM_PLUGIN_HELPFILES="${PN}.txt"
 
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-3.4-ebuilds.patch
-}
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.4-ebuilds.patch
+)



[gentoo-commits] repo/gentoo:master commit in: x11-wm/wm2/files/, x11-wm/wm2/

2021-04-19 Thread Sam James
commit: 998a6d07e751e84cc5d48c833775fb3b622d1fe5
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:26:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998a6d07

x11-wm/wm2: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 x11-wm/wm2/files/wm2-4-gentoo.patch | 45 +++--
 x11-wm/wm2/wm2-4-r1.ebuild  | 21 ++---
 2 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/x11-wm/wm2/files/wm2-4-gentoo.patch 
b/x11-wm/wm2/files/wm2-4-gentoo.patch
index 88c78080c54..f8ff09c0778 100644
--- a/x11-wm/wm2/files/wm2-4-gentoo.patch
+++ b/x11-wm/wm2/files/wm2-4-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ur wm2-4/Border.C wm2-4.new/Border.C
 wm2-4/Border.C 1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Border.C 2007-06-30 16:56:10.0 +0200
+--- a/Border.C
 b/Border.C
 @@ -183,7 +183,7 @@
  
  if (m_label) free(m_label);
@@ -10,9 +9,8 @@ diff -ur wm2-4/Border.C wm2-4.new/Border.C
  
  int len = strlen(m_label);
  m_tabHeight = XRotTextWidth(m_tabFont, m_label, len) + 6 + m_tabWidth;
-diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
 wm2-4/Buttons.C1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Buttons.C2007-06-30 16:56:10.0 +0200
+--- a/Buttons.C
 b/Buttons.C
 @@ -139,7 +139,11 @@
   (allowExit && ((n) > clients.count())) ? "[Exit wm2]" \
   : clients.item((n)-1)->label())
@@ -25,9 +23,8 @@ diff -ur wm2-4/Buttons.C wm2-4.new/Buttons.C
clients.append(m_hiddenClients.item(i));
  }
  int nh = clients.count() + 1;
-diff -ur wm2-4/Client.C wm2-4.new/Client.C
 wm2-4/Client.C 1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Client.C 2007-06-30 16:56:10.0 +0200
+--- a/Client.C
 b/Client.C
 @@ -4,7 +4,7 @@
  
  #include 
@@ -55,9 +52,8 @@ diff -ur wm2-4/Client.C wm2-4.new/Client.C
  }
  
  
-diff -ur wm2-4/Client.h wm2-4.new/Client.h
 wm2-4/Client.h 1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Client.h 2007-06-30 16:56:10.0 +0200
+--- a/Client.h
 b/Client.h
 @@ -2,6 +2,8 @@
  #ifndef _CLIENT_H_
  #define _CLIENT_H_
@@ -76,9 +72,8 @@ diff -ur wm2-4/Client.h wm2-4.new/Client.h
  int getIntegerProperty(Atom);
  
  // accessors 
-diff -ur wm2-4/Config.h wm2-4.new/Config.h
 wm2-4/Config.h 1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Config.h 2007-06-30 16:56:10.0 +0200
+--- a/Config.h
 b/Config.h
 @@ -39,6 +39,9 @@
  
  #define CONFIG_FRAME_THICKNESS7
@@ -94,9 +89,8 @@ diff -ur wm2-4/Config.h wm2-4.new/Config.h
  
  #endif
 -
-diff -ur wm2-4/General.h wm2-4.new/General.h
 wm2-4/General.h1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/General.h2007-06-30 16:56:10.0 +0200
+--- a/General.h
 b/General.h
 @@ -32,7 +32,7 @@
  #define NewString(x) (strcpy((char *)malloc(strlen(x)+1),(x)))
  
@@ -106,9 +100,8 @@ diff -ur wm2-4/General.h wm2-4.new/General.h
  #endif
  
  #define signal(x,y) \
-diff -ur wm2-4/Makefile wm2-4.new/Makefile
 wm2-4/Makefile 1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Makefile 2007-06-30 16:56:10.0 +0200
+--- a/Makefile
 b/Makefile
 @@ -1,8 +1,8 @@
  
 -LIBS  =  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
@@ -120,9 +113,8 @@ diff -ur wm2-4/Makefile wm2-4.new/Makefile
  CFLAGS= -O2
  OBJECTS   = Border.o Buttons.o Client.o Events.o Main.o Manager.o 
Rotated.o
  
-diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
 wm2-4/Manager.C1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Manager.C2007-06-30 16:56:10.0 +0200
+--- a/Manager.C
 b/Manager.C
 @@ -368,7 +368,7 @@
  return m_currentTime;
  }
@@ -132,9 +124,8 @@ diff -ur wm2-4/Manager.C wm2-4.new/Manager.C
  {
  m_signalled = True;
  }
-diff -ur wm2-4/Manager.h wm2-4.new/Manager.h
 wm2-4/Manager.h1997-03-21 12:12:30.0 +0100
-+++ wm2-4.new/Manager.h2007-06-30 16:56:10.0 +0200
+--- a/Manager.h
 b/Manager.h
 @@ -85,7 +85,7 @@
  
  static Boolean m_initialising;

diff --git a/x11-wm/wm2/wm2-4-r1.ebuild b/x11-wm/wm2/wm2-4-r1.ebuild
index 4e500c95b62..423d2be09b8 100644
--- a/x11-wm/wm2/wm2-4-r1.ebuild
+++ b/x11-wm/wm2/wm2-4-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Small, unconfigurable window manager"
 HOMEPAGE="http://www.all-day-breakfast.com/wm2/;
@@ -16,16 +17,21 @@ RDEPEND="x11-libs/libXmu"
 DEPEND="${RDEPEND}
x11-base/xorg-proto"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gentoo.patch
+)
+
 src_prepare() {
-   epatch "${FILESDIR}/${P}-gentoo.patch"
+   default
+
sed -e "s/CFLAGS/CXXFLAGS/" \
-e "s/\$(CCC) -o/\$(CCC) \$(LDFLAGS) -o/" \
 

[gentoo-commits] repo/gentoo:master commit in: x11-themes/gartoon-redux/

2021-04-19 Thread Sam James
commit: 318a8ff7020ca0ecde19feaed7c302a2bd24df69
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:12:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318a8ff7

x11-themes/gartoon-redux: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 .../gartoon-redux/gartoon-redux-1.10-r1.ebuild | 28 +++---
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild 
b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
index aeaa7890f99..9d96533afe7 100644
--- a/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
+++ b/x11-themes/gartoon-redux/gartoon-redux-1.10-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch gnome2-utils
+EAPI=7
+
+inherit gnome2-utils
 
 DESCRIPTION="A massively improved variant of the well-known Gartoon theme"
 HOMEPAGE="https://gnome-look.org/content/show.php/?content=74841;
@@ -12,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+BDEPEND="
dev-lang/perl
dev-perl/Switch
gnome-base/librsvg
@@ -20,9 +21,9 @@ DEPEND="
 
 RESTRICT="binchecks strip"
 
-src_prepare() {
-   epatch "${FILESDIR}"/${PN}-1.10-rsvg-convert.patch
-}
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.10-rsvg-convert.patch
+)
 
 src_configure() {
# perl script, not autotools based
@@ -40,6 +41,15 @@ src_install() {
dodoc AUTHORS changelog README TODO
 }
 
-pkg_preinst() {gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
+pkg_preinst() {
+   gnome2_icon_savelist
+
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}



[gentoo-commits] repo/gentoo:master commit in: app-cdr/mp3burn/, app-cdr/mp3burn/files/

2021-04-19 Thread Sam James
commit: c1e97bcd249fbe19324db6a8bfd3543958a1c93a
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:05:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1e97bcd

app-cdr/mp3burn: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch |  4 ++--
 app-cdr/mp3burn/mp3burn-0.4.2.ebuild| 26 -
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch 
b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
index 13cf94d4264..d7d814c3872 100644
--- a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
+++ b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
@@ -1,5 +1,5 @@
 mp3burn2013-08-18 23:13:34.843372424 +
-+++ mp3burn2013-08-18 23:14:15.663182707 +
+--- a/mp3burn
 b/mp3burn
 @@ -412,6 +412,8 @@
  => F.  I<(Note:  Currently, the MP3 decoder must be
  able to accept mpg123-style command-line arguments.)>

diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild 
b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
index 8c1183cd051..40200fbbd70 100644
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Burn mp3s without filling up your disk with .wav files"
 HOMEPAGE="https://sourceforge.net/projects/mp3burn;
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
+RDEPEND="
app-cdr/cdrtools
-   media-sound/mpg123
-   media-libs/flac
-   media-sound/vorbis-tools
+   dev-lang/perl
dev-perl/MP3-Info
dev-perl/Ogg-Vorbis-Header
dev-perl/String-ShellQuote
+   media-libs/flac
+   media-sound/mpg123
+   media-sound/vorbis-tools
 "
+BDEPEND="dev-lang/perl"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-   epatch "${FILESDIR}/${P}-build.patch"
-}
+PATCHES=(
+   "${FILESDIR}"/${P}-build.patch
+)
 
 src_install() {
dobin ${PN}



[gentoo-commits] repo/gentoo:master commit in: app-i18n/im-canna/

2021-04-19 Thread Sam James
commit: 713b5671f34b8fdbb0ba1bab6f7370cbcc835b1f
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:03:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713b5671

app-i18n/im-canna: drop 0.3.2.2

Signed-off-by: Sam James  gentoo.org>

 app-i18n/im-canna/im-canna-0.3.2.2.ebuild | 29 -
 1 file changed, 29 deletions(-)

diff --git a/app-i18n/im-canna/im-canna-0.3.2.2.ebuild 
b/app-i18n/im-canna/im-canna-0.3.2.2.ebuild
deleted file mode 100644
index b979ded7fff..000
--- a/app-i18n/im-canna/im-canna-0.3.2.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2-utils
-
-DESCRIPTION="Japanese Canna input method module for GTK+2"
-HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/;
-SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-i18n/canna
-   x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig"
-
-pkg_postinst() {
-   gnome2_query_immodules_gtk2
-}
-
-pkg_postrm() {
-   gnome2_query_immodules_gtk2
-}



[gentoo-commits] repo/gentoo:master commit in: app-i18n/im-canna/

2021-04-19 Thread Sam James
commit: 65037c73b9f9c45e33596cfef7d308afd2427b3b
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:02:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65037c73

app-i18n/im-canna: forward stable keywords to 0.3.2.2-r1

Signed-off-by: Sam James  gentoo.org>

 app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild 
b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
index 673a3b97344..fbbfae447fb 100644
--- a/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
+++ b/app-i18n/im-canna/im-canna-0.3.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,8 +11,7 @@ 
SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="~amd64 ppc x86"
 
 RDEPEND="app-i18n/canna
x11-libs/gtk+:2"



[gentoo-commits] repo/gentoo:master commit in: x11-themes/gtk-engines-qtpixmap/files/, x11-themes/gtk-engines-qtpixmap/

2021-04-19 Thread Sam James
commit: 592b9d052854c492fd58bb228ad7bb3ab0491a27
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:23:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=592b9d05

x11-themes/gtk-engines-qtpixmap: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 .../gtk-engines-qtpixmap-0.28-gtk_switches.patch   |  5 ++--
 .../gtk-engines-qtpixmap-0.28-r2.ebuild| 31 ++
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git 
a/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
 
b/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
index 8f5e10d6681..4ffbe414554 100644
--- 
a/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
+++ 
b/x11-themes/gtk-engines-qtpixmap/files/gtk-engines-qtpixmap-0.28-gtk_switches.patch
@@ -1,6 +1,5 @@
-diff -NurdB QtPixmap-0.28/configure.in QtPixmap-0.28-patched/configure.in
 QtPixmap-0.28/configure.in 2004-02-03 06:26:07.0 -0500
-+++ QtPixmap-0.28-patched/configure.in 2005-08-02 21:59:35.0 -0500
+--- a/configure.ac
 b/configure.ac
 @@ -19,23 +19,28 @@
  FOUND_IMLIB=0
  FOUND_GTK2=0

diff --git 
a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild 
b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
index 3e9fe287667..449e98283a8 100644
--- a/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
+++ b/x11-themes/gtk-engines-qtpixmap/gtk-engines-qtpixmap-0.28-r2.ebuild
@@ -1,43 +1,40 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit autotools epatch gnome2
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+inherit autotools gnome2
 
 MY_P="QtPixmap-${PV}"
 
 DESCRIPTION="Theme engine based on GTK pixmap engine using the Plasma color 
scheme"
 HOMEPAGE="http://www.kde-look.org/content/show.php?content=7043;
 SRC_URI="http://www.cpdrummond.freeuk.com/${MY_P}.tar.gz;
+S="${WORKDIR}"/${MY_P}
 
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
-
-IUSE=""
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 
 RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
+PATCHES=(
# Add switches to enable/disable gtk1 and gtk2 engines in the configure
# script.
-   epatch "${FILESDIR}/${P}-gtk_switches.patch"
+   "${FILESDIR}"/${P}-gtk_switches.patch
+)
 
+src_prepare() {
sed -i -e 's/AC_CHECK_COMPILERS/AC_PROG_CC/' configure.in || die
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
 
-   rm acinclude.m4
+   rm acinclude.m4 || die
+   mv configure.{in,ac} || die
 
-   eautoreconf
gnome2_src_prepare
 }
 



[gentoo-commits] repo/gentoo:master commit in: app-editors/elvis/

2021-04-19 Thread Sam James
commit: 7b1c43db1f9a77334f4e87b96d8346da905a6380
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:56:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1c43db

app-editors/elvis: drop 2.2.0-r6, 2.2.0-r7

Signed-off-by: Sam James  gentoo.org>

 app-editors/elvis/elvis-2.2.0-r6.ebuild |  96 --
 app-editors/elvis/elvis-2.2.0-r7.ebuild | 101 
 2 files changed, 197 deletions(-)

diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild 
b/app-editors/elvis/elvis-2.2.0-r6.ebuild
deleted file mode 100644
index 9fc2dbe91d1..000
--- a/app-editors/elvis/elvis-2.2.0-r6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit epatch versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="ftp://ftp.cs.pdx.edu/pub/elvis/;
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz;
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris"
-IUSE="X"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
-   X? (
-   >=x11-libs/libX11-1.0.0
-   >=x11-libs/libXt-1.0.0
-   >=x11-libs/libXpm-3.5.4.2
-   >=x11-libs/libXft-2.1.8.2 )
-   app-eselect/eselect-vi"
-DEPEND="${RDEPEND}
-   X? ( x11-base/xorg-proto )
-   virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
-   "${FILESDIR}"/${P}-glibc-2.10.patch \
-   "${FILESDIR}"/${P}-interix.patch
-}
-
-src_configure() {
-   ./configure \
-   --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
-   --prefix="${EPREFIX}"/usr \
-   --bindir="${EPREFIX}"/usr/bin \
-   --datadir="${EPREFIX}"/usr/share/elvis \
-   --docdir="${EPREFIX}"/usr/share/doc/${PF} \
-   $(use_with X x) \
-   || die
-
-   # Some Makefile fixups (must happen after configure)
-   # Use our CFLAGS
-   sed -i -e "s:gcc -O2:$(tc-getCC) ${CFLAGS}:" Makefile || die "sed 1 
failed"
-
-   # We'll install the man-pages ourselves
-   sed -i -e '/^   sh instman.sh/d' Makefile || die "sed 2 failed"
-
-   # Don't try to write to /etc
-   sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 
failed"
-
-   # Use LDFLAGS
-   sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile 
|| \
-   die "sed 4 failed"
-}
-
-src_install() {
-   dodir /usr/bin
-   dodir /usr/share/man/man1
-   dodir /usr/share/elvis
-   dodir /usr/share/doc/${PF}
-   dodir /etc
-   emake install \
-   PREFIX="${ED}"/usr \
-   BINDIR="${ED}"/usr/bin \
-   DATADIR="${ED}"/usr/share/elvis \
-   DOCDIR="${ED}"/usr/share/doc/${PF}
-
-   # Install the man-pages
-   mv doc/elvis.man doc/elvis.1
-   mv doc/elvtags.man doc/elvtags.1
-   mv doc/ref.man doc/ref.1
-   doman doc/*.1
-
-   # Fixup some READMEs
-   sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
-   || die 'sed /etc/elvis/README failed'
-   sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \
-   || die 'sed /usr/share/elvis/README failed'
-}
-
-pkg_postinst() {
-   einfo "Setting /usr/bin/vi symlink"
-   eselect vi set "${PN}"
-}
-
-pkg_postrm() {
-   einfo "Updating /usr/bin/vi symlink"
-   eselect vi update
-}

diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild 
b/app-editors/elvis/elvis-2.2.0-r7.ebuild
deleted file mode 100644
index 5df218c1ee9..000
--- a/app-editors/elvis/elvis-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_version_separator 2 '_')
-
-DESCRIPTION="A vi/ex clone"
-HOMEPAGE="http://elvis.the-little-red-haired-girl.org;
-SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz;
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris"
-IUSE="X"
-
-RDEPEND="
-   sys-libs/ncurses:0=
-   app-eselect/eselect-vi
-   X? (
-   >=x11-libs/libX11-1.0.0
-   >=x11-libs/libXt-1.0.0
-   >=x11-libs/libXpm-3.5.4.2
-   >=x11-libs/libXft-2.1.8.2
-   )"
-
-DEPEND="
-   ${RDEPEND}
-   X? ( x11-base/xorg-proto )
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-   "${FILESDIR}"/ft2.3-symbol-collision-fix.patch
-   "${FILESDIR}"/${P}-glibc-2.10.patch
-   "${FILESDIR}"/${P}-interix.patch
-)
-
-src_configure() {
-   

[gentoo-commits] repo/gentoo:master commit in: app-editors/elvis/

2021-04-19 Thread Sam James
commit: 0b3ab1f161a89cd516baa3b7c6605ae59be7fd29
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:55:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b3ab1f1

app-editors/elvis: forward stable keywords to 2.2.0-r8

Only minor changes and been in tree long enough.

Signed-off-by: Sam James  gentoo.org>

 app-editors/elvis/elvis-2.2.0-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild 
b/app-editors/elvis/elvis-2.2.0-r8.ebuild
index c02af39932b..969cfb24e3c 100644
--- a/app-editors/elvis/elvis-2.2.0-r8.ebuild
+++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz;
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris"
 IUSE="X doc"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-vim/alternate/

2021-04-19 Thread Sam James
commit: b46184cae36ec9de82ceb0246dd6d14c24007528
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:01:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46184ca

app-vim/alternate: drop 2.18-r1

Signed-off-by: Sam James  gentoo.org>

 app-vim/alternate/Manifest |  1 -
 app-vim/alternate/alternate-2.18-r1.ebuild | 26 --
 2 files changed, 27 deletions(-)

diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
index c945ae8e1f3..7732193ca8c 100644
--- a/app-vim/alternate/Manifest
+++ b/app-vim/alternate/Manifest
@@ -1,3 +1,2 @@
-DIST alternate-2.18.tar.bz2 7907 BLAKE2B 
574369557d3a56b163e7288bc60636649a2c44192c56d1d30464cbc2eb89e672aece59a205d39124e062037b3bc4983f628ae0bed53b7982915c8f9546ec4117
 SHA512 
397d39a5c5fd186f32f3e0a1651f9b9f739899ffcfdd344e85117c4bb676d8fb8c668410754fefe8934ff1a57537387d49d115dfa17bdca896e423935840ae3f
 DIST alternate-2.18.tar.gz 8652 BLAKE2B 
f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe
 SHA512 
d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
 DIST alternate.txt 8897 BLAKE2B 
b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86
 SHA512 
92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651

diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild 
b/app-vim/alternate/alternate-2.18-r1.ebuild
deleted file mode 100644
index 9fb9da078ed..000
--- a/app-vim/alternate/alternate-2.18-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: quickly switch between .c and .h files"
-HOMEPAGE="https://github.com/vim-scripts/a.vim
-https://www.vim.org/scripts/script.php?script_id=31;
-
-LICENSE="alternate"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
-
-VIM_PLUGIN_HELPTEXT=\
-"This plugin provides a new :A command which will switch between a .c
-file and the associated .h file. There is also :AS to split windows and
-:AV to split windows vertiically."
-
-PATCHES=(
-   "${FILESDIR}"/${P}-hh-cc-alternation.patch
-)
-
-src_prepare() {
-   default
-}



[gentoo-commits] repo/gentoo:master commit in: app-vim/genutils/

2021-04-19 Thread Sam James
commit: 8103770c156cc67f980a952c46c1463854989dd6
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:59:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8103770c

app-vim/genutils: forward stable keywords to 2.5-r1

Signed-off-by: Sam James  gentoo.org>

 app-vim/genutils/genutils-2.5-r1.ebuild | 5 +++--
 app-vim/genutils/genutils-2.5.ebuild| 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app-vim/genutils/genutils-2.5-r1.ebuild 
b/app-vim/genutils/genutils-2.5-r1.ebuild
index 57fc9d0c385..1d1770abc28 100644
--- a/app-vim/genutils/genutils-2.5-r1.ebuild
+++ b/app-vim/genutils/genutils-2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,9 +7,10 @@ inherit vim-plugin
 
 DESCRIPTION="vim plugin: library with various useful functions"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197;
+
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> 
${P}.zip"
 LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides library functions and is not intended to be used

diff --git a/app-vim/genutils/genutils-2.5.ebuild 
b/app-vim/genutils/genutils-2.5.ebuild
index 8cac5cf0724..a34145df707 100644
--- a/app-vim/genutils/genutils-2.5.ebuild
+++ b/app-vim/genutils/genutils-2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,6 +8,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: library with various useful functions"
 HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197;
 SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> 
${P}.zip"
+
 LICENSE="GPL-3"
 KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86"
 



[gentoo-commits] repo/gentoo:master commit in: app-vim/alternate/

2021-04-19 Thread Sam James
commit: 8b97597a77268281d340b0d6d76d7ca0589334ef
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 22:00:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 22:41:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b97597a

app-vim/alternate: forward stable keywords to 2.18-r2

Signed-off-by: Sam James  gentoo.org>

 app-vim/alternate/alternate-2.18-r1.ebuild | 1 -
 app-vim/alternate/alternate-2.18-r2.ebuild | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild 
b/app-vim/alternate/alternate-2.18-r1.ebuild
index aa90193c5c5..9fb9da078ed 100644
--- a/app-vim/alternate/alternate-2.18-r1.ebuild
+++ b/app-vim/alternate/alternate-2.18-r1.ebuild
@@ -11,7 +11,6 @@ https://www.vim.org/scripts/script.php?script_id=31;
 
 LICENSE="alternate"
 KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
-IUSE=""
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a new :A command which will switch between a .c

diff --git a/app-vim/alternate/alternate-2.18-r2.ebuild 
b/app-vim/alternate/alternate-2.18-r2.ebuild
index 5dfca7cea02..50ccc8cac64 100644
--- a/app-vim/alternate/alternate-2.18-r2.ebuild
+++ b/app-vim/alternate/alternate-2.18-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
https://www.vim.org/scripts/download_script.php?src_id=6347 -> 
${PN}.txt"
 
 LICENSE="alternate"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos"
 
 VIM_PLUGIN_HELPTEXT=\
 "This plugin provides a new :A command which will switch between a .c



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

2021-04-19 Thread Lars Wendler
commit: 9bdb86ca67f53c55ca26fca09e960c76923efb8d
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 19 21:54:01 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 19 21:54:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdb86ca

sys-apps/util-linux: Fixed use_with usage

Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/util-linux/util-linux-2.35.2.ebuild   | 2 +-
 sys-apps/util-linux/util-linux-2.36.2.ebuild   | 2 +-
 sys-apps/util-linux/util-linux-2.37_rc1.ebuild | 2 +-
 sys-apps/util-linux/util-linux-.ebuild | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild 
b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index 7a0ab5050bf..1df44660f8f 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -167,7 +167,7 @@ multilib_src_configure() {
$(multilib_native_use_with slang)
$(multilib_native_use_with systemd)
$(multilib_native_use_with udev)
-   $(multilib_native_usex ncurses "$(use_with libmagic magic)" 
'--without-libmagic')
+   $(multilib_native_usex ncurses "$(use_with magic libmagic)" 
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" 
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" 
'--without-ncurses')
$(multilib_native_use_with audit)

diff --git a/sys-apps/util-linux/util-linux-2.36.2.ebuild 
b/sys-apps/util-linux/util-linux-2.36.2.ebuild
index 1e8eeb48330..603b86d95b4 100644
--- a/sys-apps/util-linux/util-linux-2.36.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.2.ebuild
@@ -163,7 +163,7 @@ multilib_src_configure() {
$(multilib_native_use_with slang)
$(multilib_native_use_with systemd)
$(multilib_native_use_with udev)
-   $(multilib_native_usex ncurses "$(use_with libmagic magic)" 
'--without-libmagic')
+   $(multilib_native_usex ncurses "$(use_with magic libmagic)" 
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" 
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" 
'--without-ncurses')
$(multilib_native_use_with audit)

diff --git a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild 
b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
index 3339774e6b9..66a36a6cd0c 100644
--- a/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37_rc1.ebuild
@@ -192,7 +192,7 @@ multilib_src_configure() {
$(multilib_native_use_with slang)
$(multilib_native_use_with systemd)
$(multilib_native_use_with udev)
-   $(multilib_native_usex ncurses "$(use_with libmagic magic)" 
'--without-libmagic')
+   $(multilib_native_usex ncurses "$(use_with magic libmagic)" 
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" 
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" 
'--without-ncurses')
$(multilib_native_use_with audit)

diff --git a/sys-apps/util-linux/util-linux-.ebuild 
b/sys-apps/util-linux/util-linux-.ebuild
index 3339774e6b9..66a36a6cd0c 100644
--- a/sys-apps/util-linux/util-linux-.ebuild
+++ b/sys-apps/util-linux/util-linux-.ebuild
@@ -192,7 +192,7 @@ multilib_src_configure() {
$(multilib_native_use_with slang)
$(multilib_native_use_with systemd)
$(multilib_native_use_with udev)
-   $(multilib_native_usex ncurses "$(use_with libmagic magic)" 
'--without-libmagic')
+   $(multilib_native_usex ncurses "$(use_with magic libmagic)" 
'--without-libmagic')
$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" 
'--without-ncursesw')
$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" 
'--without-ncurses')
$(multilib_native_use_with audit)



[gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/

2021-04-19 Thread Lars Wendler
commit: a21804071faec09d7e78775bbaecf71b2133af00
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Apr 19 17:23:12 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 19 21:50:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2180407

sys-apps/util-linux: remove unused patches

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20461
Signed-off-by: Lars Wendler  gentoo.org>

 ...til-linux-2.33.1-fix-struct_termios-check.patch | 30 
 ...-linux-2.36.1-libmount_dont_use_symfollow.patch | 40 --
 .../files/util-linux-2.36.1-riscv32.patch  | 29 
 3 files changed, 99 deletions(-)

diff --git 
a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch 
b/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
deleted file mode 100644
index df52af45049..000
--- a/sys-apps/util-linux/files/util-linux-2.33.1-fix-struct_termios-check.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 963413a1adf6767ab17712097e288e1a346f63a7 Mon Sep 17 00:00:00 2001
-From: Khem Raj 
-Date: Fri, 4 Jan 2019 22:38:25 -0800
-Subject: [PATCH] ldattach: Check for value of _HAVE_STRUCT_TERMIOS_C_ISPEED
-
-in glibc 2.29+ checking for just existence of _HAVE_STRUCT_TERMIOS_C_ISPEED
-won't be enough, the value has to be checked
-
-see
-https://sourceware.org/git/?p=glibc.git;a=commit;h=e5a50db36eaa6e8c6427b3a971563240b633ca85
-
-Signed-off-by: Khem Raj 

- sys-utils/ldattach.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sys-utils/ldattach.c b/sys-utils/ldattach.c
-index d33d68535..fb50711eb 100644
 a/sys-utils/ldattach.c
-+++ b/sys-utils/ldattach.c
-@@ -242,7 +242,7 @@ static int my_cfsetspeed(struct termios *ts, int speed)
-* -- we have to bypass glibc and set the speed manually (because glibc
-*checks for speed and supports Bxxx bit rates only)...
-*/
--#ifdef _HAVE_STRUCT_TERMIOS_C_ISPEED
-+#if _HAVE_STRUCT_TERMIOS_C_ISPEED
- # define BOTHER 001   /* non standard rate */
-   dbg("using non-standard speeds");
-   ts->c_ospeed = ts->c_ispeed = speed;
-

diff --git 
a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch 
b/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
deleted file mode 100644
index 7c0b73f49d7..000
--- 
a/sys-apps/util-linux/files/util-linux-2.36.1-libmount_dont_use_symfollow.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 76bb9b30cfcf54b59591a57a3d2a747e514469b2 Mon Sep 17 00:00:00 2001
-From: Karel Zak 
-Date: Thu, 19 Nov 2020 09:49:16 +0100
-Subject: [PATCH] libmount: don't use "symfollow" for helpers on user mounts
-
-Addresses: https://github.com/karelzak/util-linux/issues/1193
-Signed-off-by: Karel Zak 

- libmount/src/context_mount.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
-index 8c394c1ff..dd1786176 100644
 a/libmount/src/context_mount.c
-+++ b/libmount/src/context_mount.c
-@@ -415,6 +415,9 @@ static int generate_helper_optstr(struct libmnt_context 
*cxt, char **optstr)
-* string, because there is nothing like MS_EXEC (we only have
-* MS_NOEXEC in mount flags and we don't care about the original
-* mount string in libmount for VFS options).
-+   *
-+   * This use-case makes sense for MS_SECURE flags only (see
-+   * mnt_optstr_get_flags() and mnt_context_merge_mflags()).
-*/
-   if (!(cxt->mountflags & MS_NOEXEC))
-   mnt_optstr_append_option(optstr, "exec", NULL);
-@@ -422,11 +425,8 @@ static int generate_helper_optstr(struct libmnt_context 
*cxt, char **optstr)
-   mnt_optstr_append_option(optstr, "suid", NULL);
-   if (!(cxt->mountflags & MS_NODEV))
-   mnt_optstr_append_option(optstr, "dev", NULL);
--  if (!(cxt->mountflags & MS_NOSYMFOLLOW))
--  mnt_optstr_append_option(optstr, "symfollow", NULL);
-   }
- 
--
-   if (cxt->flags & MNT_FL_SAVED_USER)
-   rc = mnt_optstr_set_option(optstr, "user", cxt->orig_user);
-   if (rc)
--- 
-2.29.2
-

diff --git a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch 
b/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
deleted file mode 100644
index b18a01906eb..000
--- a/sys-apps/util-linux/files/util-linux-2.36.1-riscv32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 367972fae13d170675768d63678577cae1890143 Mon Sep 17 00:00:00 2001
-From: Pino Toscano 
-Date: Tue, 17 Nov 2020 11:32:45 +0100
-Subject: [PATCH] hwclock: do not assume __NR_settimeofday_time32
-
-Check that __NR_settimeofday_time32 exists before trying to 

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

2021-04-19 Thread Thomas Deutschmann
commit: 4343b18757c41a58c0c40e95891d5582ec714dc7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr 19 21:33:14 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr 19 21:34:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4343b187

www-client/firefox: drop LLVM:12 support to aid smooth upgrading

USE=lto requires that LLVM version used by rust matches used LLVM version.
However, dev-lang/rust-1.51 does not support latest LLVM version (12) so
there is currently no way to automatically enforce all depedencies.

This seems to be too challenging for average Gentoo users so we are dropping
LLVM:12 support for now to aid smooth upgrading.

Bug: https://bugs.gentoo.org/784215
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 www-client/firefox/firefox-78.10.0.ebuild | 10 +-
 www-client/firefox/firefox-88.0.ebuild| 10 +-
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/www-client/firefox/firefox-78.10.0.ebuild 
b/www-client/firefox/firefox-78.10.0.ebuild
index 828551a4ac5..df54f455ff6 100644
--- a/www-client/firefox/firefox-78.10.0.ebuild
+++ b/www-client/firefox/firefox-78.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 FIREFOX_PATCHSET="firefox-78esr-patches-10.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=11
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -78,14 +78,6 @@ BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
>=virtual/rust-1.41.0
|| (
-   (
-   sys-devel/clang:12
-   sys-devel/llvm:12
-   clang? (
-   =sys-devel/lld-12*
-   pgo? ( 
=sys-libs/compiler-rt-sanitizers-12*[profile] )
-   )
-   )
(
sys-devel/clang:11
sys-devel/llvm:11

diff --git a/www-client/firefox/firefox-88.0.ebuild 
b/www-client/firefox/firefox-88.0.ebuild
index e4ce7f55368..55bcd16a48b 100644
--- a/www-client/firefox/firefox-88.0.ebuild
+++ b/www-client/firefox/firefox-88.0.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 FIREFOX_PATCHSET="firefox-88-patches-01.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=11
 
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="ncurses,sqlite,ssl"
@@ -77,14 +77,6 @@ BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig
>=virtual/rust-1.47.0
|| (
-   (
-   sys-devel/clang:12
-   sys-devel/llvm:12
-   clang? (
-   =sys-devel/lld-12*
-   pgo? ( 
=sys-libs/compiler-rt-sanitizers-12*[profile] )
-   )
-   )
(
sys-devel/clang:11
sys-devel/llvm:11



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

2021-04-19 Thread Thomas Deutschmann
commit: 93f3c5a9bd1f18946bfc3987db669b37e733b8e3
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Apr 19 21:34:26 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Apr 19 21:35:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93f3c5a9

dev-lang/spidermonkey: drop LLVM:12 support to aid smooth upgrading

USE=lto requires that LLVM version used by rust matches used LLVM version.
However, dev-lang/rust-1.51 does not support latest LLVM version (12) so
there is currently no way to automatically enforce all depedencies.

This seems to be too challenging for average Gentoo users so we are dropping
LLVM:12 support for now to aid smooth upgrading.

Bug: https://bugs.gentoo.org/784125
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild 
b/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild
index aaf36498e40..ee0d3370980 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.10.0.ebuild
@@ -7,7 +7,7 @@ EAPI="7"
 FIREFOX_PATCHSET="firefox-78esr-patches-10.tar.xz"
 SPIDERMONKEY_PATCHSET="spidermonkey-78-patches-03.tar.xz"
 
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=11
 
 PYTHON_COMPAT=( python3_{7..9} )
 
@@ -72,13 +72,6 @@ BDEPEND="${PYTHON_DEPS}
>=virtual/rust-1.41.0
virtual/pkgconfig
|| (
-   (
-   sys-devel/llvm:12
-   clang? (
-   sys-devel/clang:12
-   lto? ( =sys-devel/lld-12* )
-   )
-   )
(
sys-devel/llvm:11
clang? (



[gentoo-commits] repo/gentoo:master commit in: app-emulation/open-vm-tools/files/

2021-04-19 Thread Mike Gilbert
commit: 2c1c3fe7d60160a8a2535c081301b47ab97adb6b
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr 19 21:25:51 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 19 21:27:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1c3fe7

app-emulation/open-vm-tools: replace glib fix with upstream patch

Bug: https://bugs.gentoo.org/784077
Signed-off-by: Mike Gilbert  gentoo.org>

 .../open-vm-tools/files/11.2.5-glib-2.68.patch | 140 -
 1 file changed, 138 insertions(+), 2 deletions(-)

diff --git a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch 
b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
index 1e35f6cb673..b04342c3f68 100644
--- a/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
+++ b/app-emulation/open-vm-tools/files/11.2.5-glib-2.68.patch
@@ -1,5 +1,44 @@
 a/open-vm-tools/lib/include/tracer.hh  2021-04-19 16:42:19.967147908 
-0400
-+++ b/open-vm-tools/lib/include/tracer.hh  2021-04-19 16:42:27.364829692 
-0400
+From 82931a1bcb39d5132910c7fb2ddc086c51d06662 Mon Sep 17 00:00:00 2001
+From: John Wolfe 
+Date: Mon, 19 Apr 2021 11:08:10 -0700
+Subject: [PATCH] Fix issues using GCC 11 with gtk >= 3.20 and glib >=2.66.3
+
+With glib2.0 releases >= 2.66.3, glib header files inside an
+extern "C" block will encounter compilation errors.  This has
+impacted several OSS packages.  Consumers of newer versions of glib2.0
+must not include glib headers in an extern "C" block.
+
+GTK 3.20 has deprecated gdk_display_get_device_manager(); using the
+newer gdk_display_get_default_seat() when the GTK version is >= 3.20.
+
+The return value from read() must be used to avoid an unused result
+warning from the compiler.  This can be avoided by using dummy retyping
+in the case where the return value is not used or in this case, using
+the returned value in a debug log message.
+
+Pull Request: https://github.com/vmware/open-vm-tools/pull/505
+Addresses:https://github.com/vmware/open-vm-tools/issues/500
+Addresses:https://github.com/vmware/open-vm-tools/issues/509
+---
+ open-vm-tools/AUTHORS |  3 +++
+ open-vm-tools/lib/include/tracer.hh   |  4 +---
+ .../services/plugins/dndcp/copyPasteUIX11.cpp |  3 ++-
+ .../plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp |  6 +++---
+ open-vm-tools/services/plugins/dndcp/dndUIX11.cpp | 11 +--
+ open-vm-tools/services/plugins/dndcp/dndcp.cpp|  7 ++-
+ 6 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/open-vm-tools/lib/include/tracer.hh 
b/open-vm-tools/lib/include/tracer.hh
+index 697caedbc..e9ae892cb 100644
+--- a/open-vm-tools/lib/include/tracer.hh
 b/open-vm-tools/lib/include/tracer.hh
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2013-2017 VMware, Inc. All rights reserved.
++ * Copyright (C) 2013-2017,2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
 @@ -28,9 +28,7 @@
  
  #include "vm_basic_defs.h"
@@ -10,3 +49,100 @@
  
  
  #ifdef VMX86_DEVEL
+diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp 
b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+index 68212ab8b..080dc3d76 100644
+--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
 b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2009-2020 VMware, Inc. All rights reserved.
++ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as published
+@@ -1666,6 +1666,7 @@ CopyPasteUIX11::FileBlockMonitorThread(void *arg)   // IN
+   char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
+   ssize_t size;
+   size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
++  g_debug("%s: Number of bytes read : %" FMTSZ "u\n", __FUNCTION__, size);
+   /*
+* The current thread will block in read function until
+* any other application accesses the file params->fileBlockName
+diff --git 
a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp 
b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
+index 9b70984fc..424481baa 100644
+--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
 b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 2010-2017 VMware, Inc. All rights reserved.
++ * Copyright (C) 2010-2017,2021 VMware, Inc. All rights reserved.
+  *
+  * This program is free software; you can redistribute it and/or 

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

2021-04-19 Thread Sam James
commit: 1e1e16b8e7281ae5ae44614384f5753c0bab4a80
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:26:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:26:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1e16b8

www-servers/lighttpd: Stabilize 1.4.58 arm, #776802

Signed-off-by: Sam James  gentoo.org>

 www-servers/lighttpd/lighttpd-1.4.58.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-servers/lighttpd/lighttpd-1.4.58.ebuild 
b/www-servers/lighttpd/lighttpd-1.4.58.ebuild
index 0bef551b145..92c0cb1bb1d 100644
--- a/www-servers/lighttpd/lighttpd-1.4.58.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.58.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz;
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb 
minimal mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux 
ssl sqlite test webdav xattr zlib"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: app-cdr/cdrtools/

2021-04-19 Thread Sam James
commit: 3ec7e6ef1dc5ef61f5c4ad2c35d669262968cdc8
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:26:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:26:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec7e6ef

app-cdr/cdrtools: Stabilize 3.02_alpha09-r3 arm64, #723346

Signed-off-by: Sam James  gentoo.org>

 app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild 
b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 185a90bbaee..4d32ff116d7 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] 
&& echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-dicts/wordnet/

2021-04-19 Thread Sam James
commit: bb092dd8fd2b1513d5ada3f8bdf281e3835e7187
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:24:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:25:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb092dd8

app-dicts/wordnet: Stabilize 3.1 x86, #772071

Signed-off-by: Sam James  gentoo.org>

 app-dicts/wordnet/wordnet-3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild 
b/app-dicts/wordnet/wordnet-3.1.ebuild
index 60fc8318712..634a8a7ef65 100644
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ b/app-dicts/wordnet/wordnet-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="Princeton"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris 
~x86-solaris"
 IUSE="doc"
 
 # In contrast to what the configure script seems to imply, Tcl/Tk is NOT



[gentoo-commits] repo/gentoo:master commit in: app-dicts/wordnet/

2021-04-19 Thread Sam James
commit: 583fbc6651669bc69099b05508b6f682ef8e18f4
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:25:02 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:25:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583fbc66

app-dicts/wordnet: Stabilize 3.1 amd64, #772071

Signed-off-by: Sam James  gentoo.org>

 app-dicts/wordnet/wordnet-3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild 
b/app-dicts/wordnet/wordnet-3.1.ebuild
index 634a8a7ef65..652b2015dc5 100644
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ b/app-dicts/wordnet/wordnet-3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="Princeton"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris 
~x86-solaris"
 IUSE="doc"
 
 # In contrast to what the configure script seems to imply, Tcl/Tk is NOT



[gentoo-commits] repo/gentoo:master commit in: app-cdr/cdrtools/

2021-04-19 Thread Sam James
commit: 28567bc29c72d4cf0d9f775a0aee195afb3e315c
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:24:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:25:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28567bc2

app-cdr/cdrtools: Stabilize 3.02_alpha09-r3 amd64, #723346

Signed-off-by: Sam James  gentoo.org>

 app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild 
b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 8f7888c647c..185a90bbaee 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] 
&& echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="



[gentoo-commits] repo/gentoo:master commit in: app-cdr/cdrtools/

2021-04-19 Thread Sam James
commit: c76311650f02630811ea5402869335c977ad60b3
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:24:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:25:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7631165

app-cdr/cdrtools: Stabilize 3.02_alpha09-r3 x86, #723346

Signed-off-by: Sam James  gentoo.org>

 app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild 
b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 38f39f61459..8f7888c647c 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] 
&& echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="



[gentoo-commits] repo/proj/guru:dev commit in: www-client/badwolf/

2021-04-19 Thread Haelwenn Monnier
commit: e10fdc0f7f2695b078c32a4e78bf1471d5e85a7b
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Mon Apr 19 21:22:37 2021 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Mon Apr 19 21:22:50 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e10fdc0f

www-client/badwolf: Version clean, 1.0.3

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 www-client/badwolf/Manifest |  1 -
 www-client/badwolf/badwolf-1.0.3.ebuild | 56 -
 2 files changed, 57 deletions(-)

diff --git a/www-client/badwolf/Manifest b/www-client/badwolf/Manifest
index f246ff502..e50d49d7a 100644
--- a/www-client/badwolf/Manifest
+++ b/www-client/badwolf/Manifest
@@ -1,2 +1 @@
-DIST badwolf-1.0.3.tar.gz 70969 BLAKE2B 
0c0c57a635f34d2a48cca79737922f10812350b8f54450d3cc9d1f4f3e29766a23f80c4d1d497585dca3d9cbbb942f6b924a4c776eb98b31d2a65f7d468ca47c
 SHA512 
8b20560fe48feaeee444208fb315ca8eb8f3d847769a6a5cafd276abb38172f7c67c8ec8496bb1172a9837dce6831cd4fba6518aff50fcdf204e2737b205c31b
 DIST badwolf-1.1.0.tar.gz 76314 BLAKE2B 
e5faf43eaceece52809bc27e1c47d176373d537cb349f682eb7fbd68c3cb4b6ad510e4c2c8b55b9c5092f910321f148261f25aecddc1327dd635611dd685a57a
 SHA512 
dcde764c71519700e225c9a5488bcc092a9008c365b892a60e02bd53031801090d4ec73d0da38078a1c0061cd6be4cc41250f0cdbaf991250557c784f6aac961

diff --git a/www-client/badwolf/badwolf-1.0.3.ebuild 
b/www-client/badwolf/badwolf-1.0.3.ebuild
deleted file mode 100644
index 6389687d1..0
--- a/www-client/badwolf/badwolf-1.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg
-
-if [[ "${PV}" == "" ]]
-then
-   EGIT_REPO_URI="https://hacktivis.me/git/badwolf.git;
-   EGIT_MIN_CLONE_TYPE="single+tags"
-   inherit git-r3
-else
-   MY_P="${PN}-$(ver_rs 3 - 4 .)"
-   SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz;
-   KEYWORDS="~amd64"
-   S="${WORKDIR}/${MY_P}"
-   inherit savedconfig
-fi
-
-DESCRIPTION="Minimalist and privacy-oriented WebKitGTK+ browser"
-HOMEPAGE="https://hacktivis.me/projects/badwolf;
-LICENSE="BSD"
-SLOT="0"
-
-DOCS=("README.md" "KnowledgeBase.md")
-
-DEPEND="
-   x11-libs/gtk+:3
-   net-libs/webkit-gtk:4=
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   [[ "${PV}" == "" ]] || restore_config config.h
-   default
-}
-
-src_compile() {
-   emake \
-   CC="${CC:-cc}" \
-   CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
-   LDFLAGS="${LDFLAGS}" \
-   PREFIX="/usr"
-}
-
-src_install() {
-   emake \
-   DESTDIR="${D}" \
-   DOCDIR="/usr/share/doc/${PF}" \
-   PREFIX="/usr" \
-   install
-
-   [[ "${PV}" == "" ]] || save_config config.h
-   einstalldocs
-}



[gentoo-commits] repo/proj/guru:dev commit in: www-client/badwolf/

2021-04-19 Thread Haelwenn Monnier
commit: 0f5dae5977b631f9703f6ffedae4a4f2bd6741dc
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Mon Apr 19 21:21:31 2021 +
Commit: Haelwenn Monnier  hacktivis  me>
CommitDate: Mon Apr 19 21:22:49 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0f5dae59

www-client/badwolf: Version bump, 1.1.0

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 www-client/badwolf/Manifest |  1 +
 www-client/badwolf/badwolf-1.1.0.ebuild | 56 +
 2 files changed, 57 insertions(+)

diff --git a/www-client/badwolf/Manifest b/www-client/badwolf/Manifest
index 2a771aa6d..f246ff502 100644
--- a/www-client/badwolf/Manifest
+++ b/www-client/badwolf/Manifest
@@ -1 +1,2 @@
 DIST badwolf-1.0.3.tar.gz 70969 BLAKE2B 
0c0c57a635f34d2a48cca79737922f10812350b8f54450d3cc9d1f4f3e29766a23f80c4d1d497585dca3d9cbbb942f6b924a4c776eb98b31d2a65f7d468ca47c
 SHA512 
8b20560fe48feaeee444208fb315ca8eb8f3d847769a6a5cafd276abb38172f7c67c8ec8496bb1172a9837dce6831cd4fba6518aff50fcdf204e2737b205c31b
+DIST badwolf-1.1.0.tar.gz 76314 BLAKE2B 
e5faf43eaceece52809bc27e1c47d176373d537cb349f682eb7fbd68c3cb4b6ad510e4c2c8b55b9c5092f910321f148261f25aecddc1327dd635611dd685a57a
 SHA512 
dcde764c71519700e225c9a5488bcc092a9008c365b892a60e02bd53031801090d4ec73d0da38078a1c0061cd6be4cc41250f0cdbaf991250557c784f6aac961

diff --git a/www-client/badwolf/badwolf-1.1.0.ebuild 
b/www-client/badwolf/badwolf-1.1.0.ebuild
new file mode 100644
index 0..6389687d1
--- /dev/null
+++ b/www-client/badwolf/badwolf-1.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+if [[ "${PV}" == "" ]]
+then
+   EGIT_REPO_URI="https://hacktivis.me/git/badwolf.git;
+   EGIT_MIN_CLONE_TYPE="single+tags"
+   inherit git-r3
+else
+   MY_P="${PN}-$(ver_rs 3 - 4 .)"
+   SRC_URI="https://hacktivis.me/releases/${MY_P}.tar.gz;
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/${MY_P}"
+   inherit savedconfig
+fi
+
+DESCRIPTION="Minimalist and privacy-oriented WebKitGTK+ browser"
+HOMEPAGE="https://hacktivis.me/projects/badwolf;
+LICENSE="BSD"
+SLOT="0"
+
+DOCS=("README.md" "KnowledgeBase.md")
+
+DEPEND="
+   x11-libs/gtk+:3
+   net-libs/webkit-gtk:4=
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   [[ "${PV}" == "" ]] || restore_config config.h
+   default
+}
+
+src_compile() {
+   emake \
+   CC="${CC:-cc}" \
+   CFLAGS="${CFLAGS:--02 -Wall -Wextra}" \
+   LDFLAGS="${LDFLAGS}" \
+   PREFIX="/usr"
+}
+
+src_install() {
+   emake \
+   DESTDIR="${D}" \
+   DOCDIR="/usr/share/doc/${PF}" \
+   PREFIX="/usr" \
+   install
+
+   [[ "${PV}" == "" ]] || save_config config.h
+   einstalldocs
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/tapestrea/files/, media-sound/tapestrea/

2021-04-19 Thread Sam James
commit: c94a2a4044a53e7d6cb17bd6982b2bc5f55704d8
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:12:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94a2a40

media-sound/tapestrea: port to EAPI 7

Signed-off-by: Sam James  gentoo.org>

 ...trea-0.1.0.5-r1-underlinking-alsa-pthread.patch | 53 +++---
 media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild  | 37 +--
 2 files changed, 49 insertions(+), 41 deletions(-)

diff --git 
a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
 
b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
index a065ce0e683..3f866d5c88e 100644
--- 
a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
+++ 
b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
@@ -1,33 +1,34 @@
 --- a/src/makefile.alsa
 +++ b/src/makefile.alsa
 @@ -3,7 +3,7 @@
- CHUCK_DIR=../scripting/chuck-1.2.1.2/src
- INCLUDES=-I$(CHUCK_DIR)
- FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
--LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs 
gtk+-2.0`
-+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `${PKG_CONFIG} --libs 
gtk+-2.0` -lpthread
- 
- TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
-   taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
+ CHUCK_DIR=../scripting/chuck-1.2.1.2/src
+ INCLUDES=-I$(CHUCK_DIR)
+ FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
+-LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs 
gtk+-2.0`
++LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs 
gtk+-2.0` -lpthread
+ 
+ TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
+   taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
 --- a/scripting/chuck-1.2.1.2/src/makefile.alsa
 +++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
 @@ -5,7 +5,7 @@
- INCLUDES=
- CFLAGS?= -O3
- FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
--LIBS=-lasound -lstdc++ -ldl -lm
-+LIBS=-lasound -lstdc++ -lm -lpthread -ldl
- SF_OBJ=util_sndfile.o
- 
- ifneq ($(CHUCK_DEBUG),)
 a/src/makefile.alsa
-+++ b/src/makefile.alsa
+ INCLUDES=
+ CFLAGS?= -O3
+ FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
+-LIBS=-lasound -lstdc++ -ldl -lm
++LIBS=-lasound -lstdc++ -lm -lpthread -ldl
+ SF_OBJ=util_sndfile.o
+ 
+ ifneq ($(CHUCK_DEBUG),)
+diff -Naur a/src/makefile.alsa b/src/makefile.alsa
+--- a/src/makefile.alsa2014-01-30 02:21:02.173891275 +0100
 b/src/makefile.alsa2014-01-30 02:21:23.026891253 +0100
 @@ -48,7 +48,7 @@
- OBJS+=ui_scripting.o
- # scripting disable needs most of chuck anyway due to includes 
- # in latest rtaudio.cpp, so always keep this line:
--LIBS+=$(CHUCK_OBJS)
-+LIBS+=$(CHUCK_OBJS) -ldl
- 
- # uncomment to use preconfigured sndfile
- #FLAGS+=-D__USE_SNDFILE_PRECONF__
+ OBJS+=ui_scripting.o
+ # scripting disable needs most of chuck anyway due to includes 
+ # in latest rtaudio.cpp, so always keep this line:
+-LIBS+=$(CHUCK_OBJS)
++LIBS+=$(CHUCK_OBJS) -ldl
+ 
+ # uncomment to use preconfigured sndfile
+ #FLAGS+=-D__USE_SNDFILE_PRECONF__

diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild 
b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
index fa60300ab16..63f2f3cd377 100644
--- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
+++ b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental 
Audio"
 HOMEPAGE="http://taps.cs.princeton.edu/;
@@ -26,6 +26,11 @@ DEPEND="${RDEPEND}
sys-devel/bison:0
sys-devel/flex:0"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-gcc44.patch
+   "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+)
+
 pkg_setup() {
if ! use alsa && ! use jack && ! use oss; then
eerror "One of the following USE flags is needed: jack, alsa or 
oss"
@@ -34,8 +39,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-   epatch "${FILESDIR}"/${P}-gcc44.patch
-
# Respect LDFLAGS/CC
for bend in alsa jack oss; do
sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
@@ -51,20 +54,21 @@ src_prepare() {
sed -i -e "s:-make:\$(MAKE):g" \
"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
 
-   epatch "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+   default
 }
 
 compile_backend() {
-   backend=$1
+   backend=${1}
einfo "Compiling against ${backend}"
 
-   cd "${S}/scripting/chuck-1.2.1.2/src"
+   cd "${S}/scripting/chuck-1.2.1.2/src" || die
+
emake -f "makefile.${backend}" \
-   

[gentoo-commits] repo/gentoo:master commit in: games-arcade/aop/

2021-04-19 Thread Sam James
commit: 7cb437f4d36f8e03508fd9ccdc4baa1732273ad0
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:20:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb437f4

games-arcade/aop: respect CC

Signed-off-by: Sam James  gentoo.org>

 games-arcade/aop/aop-0.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/aop/aop-0.6-r2.ebuild 
b/games-arcade/aop/aop-0.6-r2.ebuild
index 8cc1d56adb2..2f52e08067c 100644
--- a/games-arcade/aop/aop-0.6-r2.ebuild
+++ b/games-arcade/aop/aop-0.6-r2.ebuild
@@ -24,7 +24,7 @@ PATCHES=(
 src_prepare() {
default
 
-   tc-export PKG_CONFIG
+   tc-export CC PKG_CONFIG
 
sed -i \
-e "s#/usr/local/share#/usr/share/${PN}#" \



[gentoo-commits] repo/gentoo:master commit in: media-radio/direwolf/

2021-04-19 Thread Sam James
commit: 456cf7efc787e96da1b1bbe650dea9aa17fdfaf7
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 20:58:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456cf7ef

media-radio/direwolf: pass PKG_CONFIG to make

Signed-off-by: Sam James  gentoo.org>

 media-radio/direwolf/direwolf-1.5-r1.ebuild | 6 +-
 media-radio/direwolf/direwolf-1.5.ebuild| 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/media-radio/direwolf/direwolf-1.5-r1.ebuild 
b/media-radio/direwolf/direwolf-1.5-r1.ebuild
index fbf5fe96c01..ee2fa3ecbbd 100644
--- a/media-radio/direwolf/direwolf-1.5-r1.ebuild
+++ b/media-radio/direwolf/direwolf-1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux 
Fans"
 HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md;
@@ -46,6 +46,10 @@ src_prepare() {
fi
 }
 
+src_compile() {
+   emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
 src_install() {
dodir /usr
dodir /usr/bin

diff --git a/media-radio/direwolf/direwolf-1.5.ebuild 
b/media-radio/direwolf/direwolf-1.5.ebuild
index 6b6730555d7..5cb4b02481d 100644
--- a/media-radio/direwolf/direwolf-1.5.ebuild
+++ b/media-radio/direwolf/direwolf-1.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd
+inherit systemd toolchain-funcs
 
 DESCRIPTION="Decoded Information from Radio Emissions for Windows Or Linux 
Fans"
 HOMEPAGE="https://github.com/wb2osz/direwolf/blob/master/README.md;
@@ -46,6 +46,10 @@ src_prepare() {
fi
 }
 
+src_compile() {
+   emake PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
 src_install() {
dodir /usr
dodir /usr/bin



[gentoo-commits] repo/gentoo:master commit in: games-arcade/methane/

2021-04-19 Thread Sam James
commit: 21416cadaa9a33d4fa053aa916b6162cc1466752
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:22:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21416cad

games-arcade/methane: respect CXX

Signed-off-by: Sam James  gentoo.org>

 games-arcade/methane/methane-1.5.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-arcade/methane/methane-1.5.1-r1.ebuild 
b/games-arcade/methane/methane-1.5.1-r1.ebuild
index a3f72605a59..7d0a032b4cc 100644
--- a/games-arcade/methane/methane-1.5.1-r1.ebuild
+++ b/games-arcade/methane/methane-1.5.1-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
-e "s:@GENTOO_DATADIR@:/usr/share:" \
sources/target.cpp || die
 
-   tc-export PKG_CONFIG
+   tc-export CXX PKG_CONFIG
 
# fix weird parallel make issue wrt #450422
mkdir build || die



[gentoo-commits] repo/gentoo:master commit in: media-sound/mp3info/

2021-04-19 Thread Sam James
commit: d88b4e679d122842574bd290f1fe93d116706e4f
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:14:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88b4e67

media-sound/mp3info: pass PKG_CONFIG directly to make

Signed-off-by: Sam James  gentoo.org>

 media-sound/mp3info/mp3info-0.8.5a-r1.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild 
b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index f59b6efb37a..11ba9807f0f 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -30,8 +30,12 @@ PATCHES=(
 )
 
 src_compile() {
-   tc-export PKG_CONFIG
-   emake mp3info $(usex gtk gmp3info '') CC="$(tc-getCC)" 
CFLAGS="${CFLAGS}"
+   emake \
+   PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+   CC="$(tc-getCC)" \
+   CFLAGS="${CFLAGS}" \
+   mp3info \
+   $(usex gtk gmp3info '')
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/jack_capture/

2021-04-19 Thread Sam James
commit: 3bad1e815b242d10f4faacea83eb00d3f6d025e5
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:15:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bad1e81

media-sound/jack_capture: explicitly pass PKG_CONFIG to make

Signed-off-by: Sam James  gentoo.org>

 media-sound/jack_capture/jack_capture-0.9.73.ebuild | 4 ++--
 media-sound/jack_capture/jack_capture-.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/jack_capture/jack_capture-0.9.73.ebuild 
b/media-sound/jack_capture/jack_capture-0.9.73.ebuild
index c9e7eec644a..d44b0de8f15 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73.ebuild
@@ -39,9 +39,9 @@ src_prepare() {
 }
 
 src_compile() {
-   tc-export CC CXX PKG_CONFIG
+   tc-export CC CXX
 
-   emake PREFIX="${EPREFIX}/usr" jack_capture
+   emake PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${EPREFIX}/usr" 
jack_capture
 }
 
 src_install() {

diff --git a/media-sound/jack_capture/jack_capture-.ebuild 
b/media-sound/jack_capture/jack_capture-.ebuild
index 0ca797fb04b..15a6a0cbbd2 100644
--- a/media-sound/jack_capture/jack_capture-.ebuild
+++ b/media-sound/jack_capture/jack_capture-.ebuild
@@ -38,9 +38,9 @@ src_prepare() {
 }
 
 src_compile() {
-   tc-export CC CXX PKG_CONFIG
+   tc-export CC CXX
 
-   emake PREFIX="${EPREFIX}/usr" jack_capture
+   emake PKG_CONFIG="$(tc-getPKG_CONFIG)" PREFIX="${EPREFIX}/usr" 
jack_capture
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: media-radio/qrq/

2021-04-19 Thread Sam James
commit: ebcad29e3cfcbf0b6516c2f1c744abf36d417305
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 19 21:00:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 19 21:23:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebcad29e

media-radio/qrq: pass PKG_CONFIG to make

Signed-off-by: Sam James  gentoo.org>

 media-radio/qrq/qrq-0.3.3.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-radio/qrq/qrq-0.3.3.ebuild b/media-radio/qrq/qrq-0.3.3.ebuild
index 6eabc1e68a7..ad8dcdd3caa 100644
--- a/media-radio/qrq/qrq-0.3.3.ebuild
+++ b/media-radio/qrq/qrq-0.3.3.ebuild
@@ -29,13 +29,11 @@ src_prepare() {
 }
 
 src_compile() {
-   tc-export PKG_CONFIG
-
CONF="USE_PA=NO USE_OSS=YES"
if use pulseaudio; then
CONF="USE_PA=YES USE_OSS=NO"
fi
-   emake ${CONF}
+   emake PKG_CONFIG="$(tc-getPKG_CONFIG)" ${CONF}
 }
 
 src_install() {



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

2021-04-19 Thread Michał Górny
commit: fa177fa30bb34460011dcce310ab53b92b44a156
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 19 20:55:21 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Apr 19 21:22:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa177fa3

dev-python/argcomplete: Bump to 1.12.3

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/argcomplete/Manifest  |  1 +
 dev-python/argcomplete/argcomplete-1.12.3.ebuild | 42 
 2 files changed, 43 insertions(+)

diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index e93f068f90b..00a032d037b 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1 +1,2 @@
 DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 
59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470
 SHA512 
3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
+DIST argcomplete-1.12.3.tar.gz 76128 BLAKE2B 
6924e53af37e4ea614dde4c76f44e5c2b777f8daa8fa8db53d6cbe06f56f2ce3edd11a9baad6fb2571e701fb74e02fbb8eed8ce1067c599fbb156ebd8289cccd
 SHA512 
b302d2b1250b7159177a8491b2595c2166a2b96ac4d98cf45202282541f7da53c9f272ec778133d1734a22a07d490652b9d4c956af727397b2f6767a9a445b63

diff --git a/dev-python/argcomplete/argcomplete-1.12.3.ebuild 
b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
new file mode 100644
index 000..8e10b106c08
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.12.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   $(python_gen_cond_dep '
+"${T}"/inputrc || die
+   local -x INPUTRC="${T}"/inputrc
+   distutils-r1_src_test
+}
+
+python_test() {
+   "${EPYTHON}" test/test.py -v || die
+}



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

2021-04-19 Thread Michał Górny
commit: 03011671a924070a92672e6b19cd2aeca59e0bb5
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Apr 19 20:50:51 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Apr 19 21:22:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03011671

dev-python/jsondiff: Bump to 1.3.0

Signed-off-by: Michał Górny  gentoo.org>

 dev-python/jsondiff/Manifest  |  1 +
 dev-python/jsondiff/jsondiff-1.3.0.ebuild | 33 +++
 2 files changed, 34 insertions(+)

diff --git a/dev-python/jsondiff/Manifest b/dev-python/jsondiff/Manifest
index dc2455ef7c1..2311d358b58 100644
--- a/dev-python/jsondiff/Manifest
+++ b/dev-python/jsondiff/Manifest
@@ -1 +1,2 @@
 DIST jsondiff-1.2.0.tar.gz 15076 BLAKE2B 
2d659598e6c647c8ea6622fc982808381e570c6ced23b5e77431b52e9fa746a5dbc743c739506362497d1f45dd2c290f23f459713ef31e927c05816e56659762
 SHA512 
5aa391ccc42d07330dfcf272b78aeb130f6f9033ca8b00cbea93549e32f07b98ea84cd6a1e61ab331da3de92838c69a501f95a9adb5f48e2eec46eb653264d55
+DIST jsondiff-1.3.0.tar.gz 15283 BLAKE2B 
408070816a4b21a3f11f5b039464ba276fb253f712f29930454167d3aff22f78b4d828aba5e28cf05587c8a296b908fd1945a65958244a1093279bff5e3a555c
 SHA512 
512e34d1a0673ed785f066c284c09412a3590ad916913ae1885ac567795cc73e2adf30596b60b64b6b379954e6cb82d5174e80dd9cf40ed53f6968bec8a3d8f2

diff --git a/dev-python/jsondiff/jsondiff-1.3.0.ebuild 
b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
new file mode 100644
index 000..719f5a89b88
--- /dev/null
+++ b/dev-python/jsondiff/jsondiff-1.3.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Diff JSON and JSON-like structures in Python"
+HOMEPAGE="
+   https://github.com/xlwings/jsondiff/
+   https://pypi.org/project/jsondiff/;
+SRC_URI="
+   https://github.com/fzumstein/${PN}/archive/${PV}.tar.gz
+   -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+   test? (
+   dev-python/nose-random[${PYTHON_USEDEP}]
+   )
+"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+   # Avoid file collision with jsonpatch's jsondiff cli.
+   sed -e "/'jsondiff=jsondiff.cli/ d" -i setup.py || die
+   distutils-r1_python_prepare_all
+}



  1   2   3   4   >