[gentoo-commits] repo/gentoo:master commit in: net-misc/ipmiview/
commit: 8b0958c0a395b432ca7cba7d8a2c7f8136cb99d0
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:56:03 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:56:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b0958c0
net-misc/ipmiview: drop old version
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-misc/ipmiview/Manifest | 1 -
net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild | 81 -
2 files changed, 82 deletions(-)
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index 3e8cc63342e..757079b9e06 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,2 +1 @@
-DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B
915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766
SHA512
17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
DIST IPMIView_2.18.0_build.201007_bundleJRE_Linux_x64.tar.gz 108315796 BLAKE2B
5ffbe555245a6fce04bd53ad7f91f8a7aef3b645b0f9affa0aaa7fbaa221cc7259d0de2ee7bf9a3d6e79f5525190314435c4553c785c1b345030edd7b46126d8
SHA512
bda6116f59776b93c449711ad890160238b53ec93aabc669b2c5938eaee7f594e3b91a11f8c293110874fb13c2ed94692257c16fbffe7f86c1d2ee757d30b948
diff --git a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
deleted file mode 100644
index e6d9549403f..000
--- a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop java-pkg-2 prefix
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="IPMIView"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="A GUI application that allows to manage multiple target systems
through BMC"
-HOMEPAGE="https://www.supermicro.com/;
-SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz;
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
- net-misc/stunnel
- sys-libs/ncurses-compat:5
- virtual/jre:1.8
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DIR="/usr/share/${PN}"
-QA_PREBUILT="usr/lib*"
-
-src_unpack() {
- unpack ${A}
- mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64 ${P} || die
-}
-
-src_prepare() {
- default
-
- # Extract icons for menu entries
- unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
-
- # Don't use their scary launchers
- rm -v lax.jar || die
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- java-pkg_dojar *.jar
- java-pkg_doso *64.so
-
- local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
- java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
- java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}"
- java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar
-pre "${pre}"
- java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
- java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
-
- exeinto ${DIR}/jre/bin
- newexe $(prefixify_ro "${FILESDIR}"/fake-java-r1.bash) java
-
- insinto ${DIR}/lib/BMCSecurity
- doins BMCSecurity/*.{crt,key,pem,txt}
-
- insinto ${DIR}/lib/BMCSecurity/linux
- doins BMCSecurity/linux/stunnel.conf
-
- dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
- dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
-
- doicon ipmi{view,trap}.ico
- make_desktop_entry ipmiview IPMIView ipmiview.ico
- make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
-
- local DOCS=( *.pdf *.txt )
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/ipmiview/
commit: 8b39399becd981739e5edde3740152d89fd9da88
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:55:21 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:55:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b39399b
net-misc/ipmiview: bump to version 2.18.0
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
net-misc/ipmiview/Manifest | 1 +
net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild | 81 +
2 files changed, 82 insertions(+)
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index 21862601db1..3e8cc63342e 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1 +1,2 @@
DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B
915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766
SHA512
17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
+DIST IPMIView_2.18.0_build.201007_bundleJRE_Linux_x64.tar.gz 108315796 BLAKE2B
5ffbe555245a6fce04bd53ad7f91f8a7aef3b645b0f9affa0aaa7fbaa221cc7259d0de2ee7bf9a3d6e79f5525190314435c4553c785c1b345030edd7b46126d8
SHA512
bda6116f59776b93c449711ad890160238b53ec93aabc669b2c5938eaee7f594e3b91a11f8c293110874fb13c2ed94692257c16fbffe7f86c1d2ee757d30b948
diff --git a/net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
b/net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
new file mode 100644
index 000..e6d9549403f
--- /dev/null
+++ b/net-misc/ipmiview/ipmiview-2.18.0.201007.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 prefix
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="IPMIView"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="A GUI application that allows to manage multiple target systems
through BMC"
+HOMEPAGE="https://www.supermicro.com/;
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz;
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ net-misc/stunnel
+ sys-libs/ncurses-compat:5
+ virtual/jre:1.8
+"
+
+BDEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+DIR="/usr/share/${PN}"
+QA_PREBUILT="usr/lib*"
+
+src_unpack() {
+ unpack ${A}
+ mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64 ${P} || die
+}
+
+src_prepare() {
+ default
+
+ # Extract icons for menu entries
+ unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
+
+ # Don't use their scary launchers
+ rm -v lax.jar || die
+}
+
+src_compile() {
+ :
+}
+
+src_install() {
+ java-pkg_dojar *.jar
+ java-pkg_doso *64.so
+
+ local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
+ java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
+ java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}"
+ java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar
-pre "${pre}"
+ java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
+ java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
+
+ exeinto ${DIR}/jre/bin
+ newexe $(prefixify_ro "${FILESDIR}"/fake-java-r1.bash) java
+
+ insinto ${DIR}/lib/BMCSecurity
+ doins BMCSecurity/*.{crt,key,pem,txt}
+
+ insinto ${DIR}/lib/BMCSecurity/linux
+ doins BMCSecurity/linux/stunnel.conf
+
+ dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
+ dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
+
+ doicon ipmi{view,trap}.ico
+ make_desktop_entry ipmiview IPMIView ipmiview.ico
+ make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
+
+ local DOCS=( *.pdf *.txt )
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luacheck/
commit: 2d8bc1e5d1617555e8dec9369a924ec9a586af20 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Nov 29 01:37:47 2020 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Nov 29 01:37:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8bc1e5 dev-lua/luacheck: add myself as maintainer Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> dev-lua/luacheck/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-lua/luacheck/metadata.xml b/dev-lua/luacheck/metadata.xml index dcba9d1f577..fa1113bb8ed 100644 --- a/dev-lua/luacheck/metadata.xml +++ b/dev-lua/luacheck/metadata.xml @@ -1,6 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> + + conik...@gentoo.org + Conrad Kostecki + vpayno+gen...@gmail.com Victor Payno
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/lua-argparse/
commit: 675f7bbe8591f55534e6ff5a5d88e16f59751193
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 00:21:27 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675f7bbe
dev-lua/lua-argparse: migrate to lua eclass
Closes: https://bugs.gentoo.org/752924
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
.../lua-argparse/lua-argparse-0.6.0-r100.ebuild| 60 ++
dev-lua/lua-argparse/metadata.xml | 4 ++
profiles/package.mask | 1 +
3 files changed, 65 insertions(+)
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
new file mode 100644
index 000..ea350b4d10e
--- /dev/null
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r100.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Command line argument parser for the Lua Programming Language"
+HOMEPAGE="https://github.com/mpeterv/argparse;
+SRC_URI="https://github.com/mpeterv/${PN/lua-/}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN//lua-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ test? (
+ >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+ ${RDEPEND}
+ )
+"
+
+src_compile() {
+ if use doc; then
+ sphinx-build docsrc html || die
+ rm -rf "${S}"/html/{.doctrees,_sources} || die
+ fi
+}
+
+lua_src_test() {
+ busted --exclude-tags="unsafe" --lua=${ELUA} || die
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ insinto "$(lua_get_lmod_dir)"
+ doins src/argparse.lua
+}
+
+src_install() {
+ default
+
+ use doc && local -a HTML_DOCS=( "html/." )
+ einstalldocs
+
+ lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/lua-argparse/metadata.xml
b/dev-lua/lua-argparse/metadata.xml
index 3af62013677..5ec193fa4b3 100644
--- a/dev-lua/lua-argparse/metadata.xml
+++ b/dev-lua/lua-argparse/metadata.xml
@@ -1,6 +1,10 @@
http://www.gentoo.org/dtd/metadata.dtd;>
+
+ conik...@gmail.com
+ Conrad Kostecki
+
vpayno+gen...@gmail.com
Victor Payno
diff --git a/profiles/package.mask b/profiles/package.mask
index 23342c0de62..2eaf9456d62 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -513,6 +513,7 @@ dev-lua/luacrypto
>=dev-lua/dkjson-2.5-r100
>=dev-lua/ldoc-1.4.6-r100
>=dev-lua/lpeg-1.0.2-r100
+>=dev-lua/lua-argparse-0.6.0-r100
>=dev-lua/lua-bit32-5.3.5-r100
>=dev-lua/lua-utf8-0.1.3-r100
>=dev-lua/lua-zlib-1.2-r100
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luacheck/
commit: 6634cdc743b4824d44c9d465d4084ba4c5eb0591
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:31:38 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6634cdc7
dev-lua/luacheck: drop old version
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/luacheck/luacheck-0.20.0.ebuild | 49 -
1 file changed, 49 deletions(-)
diff --git a/dev-lua/luacheck/luacheck-0.20.0.ebuild
b/dev-lua/luacheck/luacheck-0.20.0.ebuild
deleted file mode 100644
index 070046152a0..000
--- a/dev-lua/luacheck/luacheck-0.20.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for linting and static analysis of Lua code"
-HOMEPAGE="https://github.com/mpeterv/luacheck;
-SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86"
-IUSE="doc luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-lua/luafilesystem[luajit=]
- !luajit? ( >=dev-lang/lua-5.1:= )
- luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- test? ( dev-lua/busted )"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_compile() {
- if use doc; then
- sphinx-build docsrc html || die
- fi
-}
-
-src_test() {
- busted -o gtest || die
-}
-
-src_install() {
- local instdir
- instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit
'luajit' 'lua'))"
- insinto "${instdir#${EPREFIX}}"
- doins -r src/luacheck
-
- newbin bin/luacheck.lua luacheck
-
- use doc && HTML_DOCS+=( html/. )
-
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-argparse/
commit: 69923c94494f0ec7a864262a8b81150b3b5329be
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:23:36 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69923c94
dev-lua/lua-argparse: add missing keywords
Bug: https://bugs.gentoo.org/729794
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
index 622008feced..550dc291e33 100644
--- a/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
+++ b/dev-lua/lua-argparse/lua-argparse-0.6.0-r1.ebuild
@@ -10,7 +10,7 @@
SRC_URI="https://github.com/mpeterv/argparse/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="doc luajit test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luacheck/
commit: 4c2c94561492bba0f711f1f89eac5c173e8390fe
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:30:39 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2c9456
dev-lua/luacheck: update deps
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/luacheck/luacheck-0.20.0-r1.ebuild | 49 ++
1 file changed, 49 insertions(+)
diff --git a/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
new file mode 100644
index 000..01238064b62
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.20.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for linting and static analysis of Lua code"
+HOMEPAGE="https://github.com/mpeterv/luacheck;
+SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+IUSE="doc luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-lua/luafilesystem[luajit(-)=]
+ !luajit? ( >=dev-lang/lua-5.1:= )
+ luajit? ( dev-lang/luajit:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ test? ( dev-lua/busted )"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_compile() {
+ if use doc; then
+ sphinx-build docsrc html || die
+ fi
+}
+
+src_test() {
+ busted -o gtest || die
+}
+
+src_install() {
+ local instdir
+ instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit
'luajit' 'lua'))"
+ insinto "${instdir#${EPREFIX}}"
+ doins -r src/luacheck
+
+ newbin bin/luacheck.lua luacheck
+
+ use doc && HTML_DOCS+=( html/. )
+
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luacheck/
commit: 46f4a77e32acc68fd335083575ce2124024afc27
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:27:18 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f4a77e
dev-lua/luacheck: add keywords and update deps
Also fixed tests.
Closes: https://bugs.gentoo.org/729794
Closes: https://bugs.gentoo.org/723156
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/luacheck/luacheck-0.23.0-r1.ebuild | 56 ++
1 file changed, 56 insertions(+)
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
new file mode 100644
index 000..47d0aed6d00
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.23.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for linting and static analysis of Lua code"
+HOMEPAGE="https://github.com/mpeterv/luacheck;
+SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64"
+IUSE="doc luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-lua/lua-argparse[luajit(-)=]
+ dev-lua/luafilesystem[luajit(-)=]
+ dev-lua/lua-utf8[luajit(-)=]
+ !luajit? ( >=dev-lang/lua-5.1:= )
+ luajit? ( dev-lang/luajit:2 )"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ test? (
+ ${RDEPEND}
+ dev-lua/busted
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
+src_compile() {
+ if use doc; then
+ sphinx-build docsrc html || die
+ fi
+}
+
+src_test() {
+ busted -o gtest || die
+}
+
+src_install() {
+ local instdir
+ instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit
'luajit' 'lua'))"
+ insinto "${instdir#${EPREFIX}}"
+ doins -r src/luacheck
+
+ newbin bin/luacheck.lua luacheck
+
+ use doc && local HTML_DOCS=( html/. )
+
+ local -a DOCS=( CHANGELOG.md LICENSE README.md )
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luacheck/files/, profiles/, dev-lua/luacheck/
commit: ca240a16a012b7d4c547024841f1f48211e96f1f
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 00:55:11 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca240a16
dev-lua/luacheck: migrate to lua eclass
Bug: https://bugs.gentoo.org/723156
Bug: https://bugs.gentoo.org/729794
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
...0.23.0-disable-measuring-performance-test.patch | 13 +
dev-lua/luacheck/luacheck-0.23.0-r100.ebuild | 65 ++
profiles/package.mask | 1 +
3 files changed, 79 insertions(+)
diff --git
a/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
new file mode 100644
index 000..04d40ec958b
--- /dev/null
+++
b/dev-lua/luacheck/files/luacheck-0.23.0-disable-measuring-performance-test.patch
@@ -0,0 +1,13 @@
+--- a/spec/cli_spec.lua
b/spec/cli_spec.lua
+@@ -68,10 +68,6 @@
+ assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config")
+end)
+
+- it("allows measuring performance", function()
+- assert.equal(0, get_exitcode "spec/samples/good_code.lua --no-config
--profile")
+- end)
+-
+it("removes ./ in the beginnings of file names", function()
+ assert.equal([[
+ Checking spec/samples/good_code.lua OK
diff --git a/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
new file mode 100644
index 000..995faeb6e69
--- /dev/null
+++ b/dev-lua/luacheck/luacheck-0.23.0-r100.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A tool for linting and static analysis of Lua code"
+HOMEPAGE="https://github.com/mpeterv/luacheck;
+SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-lua/lua-argparse-0.6.0-r100[${LUA_USEDEP}]
+ >=dev-lua/lua-utf8-0.1.3-r100[${LUA_USEDEP}]
+ >=dev-lua/luafilesystem-1.8.0-r100[${LUA_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ test? (
+ >=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+ ${RDEPEND}
+ )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.23.0-disable-measuring-performance-test.patch" )
+
+src_compile() {
+ if use doc; then
+ sphinx-build docsrc html || die
+ fi
+}
+
+lua_src_test() {
+ busted --lua=${ELUA} || die
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ insinto "$(lua_get_lmod_dir)"
+ doins -r src/luacheck
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+
+ newbin bin/luacheck.lua luacheck
+
+ use doc && local -a HTML_DOCS=( "html/." )
+ einstalldocs
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 2eaf9456d62..83b1ae122dc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -518,6 +518,7 @@ dev-lua/luacrypto
>=dev-lua/lua-utf8-0.1.3-r100
>=dev-lua/lua-zlib-1.2-r100
>=dev-lua/LuaBitOp-1.0.2-r100
+>=dev-lua/luacheck-0.23.0-r100
>=dev-lua/luadbi-0.7.2-r100
>=dev-lua/luaevent-0.4.6-r100
=dev-lua/luaexpat-1.3.0-r100
[gentoo-commits] repo/gentoo:master commit in: dev-lua/luacheck/
commit: 5f9219dac9d0235d4d7399f9004461eb248ac162
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Nov 29 01:28:22 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Nov 29 01:32:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f9219da
dev-lua/luacheck: drop old version
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/luacheck/luacheck-0.23.0.ebuild | 54 -
1 file changed, 54 deletions(-)
diff --git a/dev-lua/luacheck/luacheck-0.23.0.ebuild
b/dev-lua/luacheck/luacheck-0.23.0.ebuild
deleted file mode 100644
index bfdbe93ecb2..000
--- a/dev-lua/luacheck/luacheck-0.23.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="A tool for linting and static analysis of Lua code"
-HOMEPAGE="https://github.com/mpeterv/luacheck;
-SRC_URI="https://github.com/mpeterv/luacheck/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="doc luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-lua/lua-argparse[luajit=]
- dev-lua/luafilesystem[luajit(-)=]
- dev-lua/lua-utf8[luajit=]
- !luajit? ( >=dev-lang/lua-5.1:= )
- luajit? ( dev-lang/luajit:2 )"
-BDEPEND="
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
- test? (
- ${RDEPEND}
- dev-lua/busted
- )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- if use doc; then
- sphinx-build docsrc html || die
- fi
-}
-
-src_test() {
- busted -o gtest || die
-}
-
-src_install() {
- local instdir
- instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD $(usex luajit
'luajit' 'lua'))"
- insinto "${instdir#${EPREFIX}}"
- doins -r src/luacheck
-
- newbin bin/luacheck.lua luacheck
-
- use doc && local HTML_DOCS=( html/. )
-
- local -a DOCS=( CHANGELOG.md LICENSE README.md )
- einstalldocs
-}
[gentoo-commits] repo/gentoo:master commit in: app-emulation/kompose/
commit: 33c588db1da2bf496103ade24a84f501da72293a
Author: William Hubbs gentoo org>
AuthorDate: Sun Nov 29 00:18:46 2020 +
Commit: William Hubbs gentoo org>
CommitDate: Sun Nov 29 00:39:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33c588db
app-emulation/kompose: remove old
Signed-off-by: William Hubbs gentoo.org>
app-emulation/kompose/Manifest | 2 --
app-emulation/kompose/kompose-1.16.0.ebuild | 30 -
app-emulation/kompose/kompose-1.19.0.ebuild | 30 -
3 files changed, 62 deletions(-)
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 8a27034b7dd..c9c18f7e48d 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -532,8 +532,6 @@ DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.mod 71 BLAKE2B
5379c4cfec1c33cee99fc39e4c3
DIST k8s.io%2Fklog%2Fv2%2F@v%2Fv2.2.0.zip 45140 BLAKE2B
c7271958036e25fcaebf47cba48efd18029563731e8648cf0e52247e538b9fec5b3afe74c1b3d071927b3cee29553c8a891dcc1cb920a3a3b17e1cacc8887bbf
SHA512
f4adb771c1131f778d2b3f9154e8f855f5ad3882f1a932afc7b4457f9413fa43340e993e6a80cb930019a8e712d40fb62542efb524a2688635b6445f8f9dcb1e
DIST k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200427153329-656914f816f9.mod 1576
BLAKE2B
cf5c64b8ea229cfa89dea8ded6e26d5669f0cafcd0265436060e9fad534df273e44f246bd28203613796e5503bcd245d94a0e70c82d7a1c797abd0170caae2cc
SHA512
66bcaee932ce76200d93cacc3f17cc654fb5bf6ab75da30850b9899c3e6b2d000839eef5f33cb257f6a13494dbb69b940c800b6bd31ea7542a69b60276269251
DIST k8s.io%2Fkubernetes%2F@v%2Fv1.13.0.mod 25 BLAKE2B
4060536d51fac9854215957b1108a158adb0b3aeb8bfc659eca1140efdcf79cffe378db6f3cb1f4a4b68aa36468b7d5631e993d5a089eb839bd03b6b608496be
SHA512
2349b7dbe8409836cc70d97c5b336f518b809f5731baf05ce68d957c9970895a9b7f89caf09763794cf13824ee29410b3a6e431b2da7f64610895c44b86c4d2d
-DIST kompose-1.16.0.tar.gz 5241785 BLAKE2B
9958b200827b70c94a499981880cc7a5d8137354205d96657d854aefebbd877e332ac3047f59e13b62dd6b9a9235d1ed83bb8b8de973d59f81906b3f376176a0
SHA512
267601ba51f5cfcbb95b9fbf52bbb99f9c810de8edb301b635a50936d7a714dc8410352ff3a4aa8819de1659a45cbb42caf5e552023cfa594a0eb8e99db57522
-DIST kompose-1.19.0.tar.gz 5314491 BLAKE2B
c03f7ece6dc91979a147bb1689525318b7c31b22242e6fbf5387469d3196dfc569178235b5a52ccdd9647ceb626be313017484451f149e375edf3b48da063328
SHA512
571c5f23a19ba1f7a403e2369d74a5f6ba051c5e9c27b79bf5ab05f8dfc9abd523862dad7da3cd0d503e4de2e7cd1eea8d8921b0bbe79db81f11a23fbe64
DIST kompose-1.22.0.tar.gz 321371 BLAKE2B
6a692c4ff4afc835ec6a3319e266849c6a9d2fda50828586eacc1b3b07c743acef7d3427fc3413af6e6ca8e435fd1e4ecfaef588d9be7091a08e45e4b8e4b053
SHA512
09c2520b759dcc452f6d55b171d9c002ccdab96cf01cd9b67be33070c8b3faff0a189ca30731376386d214002e2c44ffe27715aa74039a8adbae946d2b03d1d0
DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B
61110bed2b9e99e0250cf6e8b842257202c89b3462edf9368b73cab29f9dbd4dcc66c3e290a1d6329b7d62321eecc52082a8c4c0797eac743a29a8a00910a93f
SHA512
db50ff677b0bdccbc1a1ad3df7c5cc76f2fcccf3ab99d08d1c2868440eb9b893fe89452f4286f7d42f2f16abf0f4acda67fe86e174dcfa730a743aafcc166774
DIST
sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-2020011632-67a7b8c61874.mod
298 BLAKE2B
c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b
SHA512
d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
diff --git a/app-emulation/kompose/kompose-1.16.0.ebuild
b/app-emulation/kompose/kompose-1.16.0.ebuild
deleted file mode 100644
index 8804d097f4e..000
--- a/app-emulation/kompose/kompose-1.16.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-GIT_COMMIT="0c01309fe899c587e8cb02e9c31196ee66ab5093"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io;
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
- export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
- GOPATH="${S}" go build -v -ldflags="-X
github.com/kubernetes/kompose/cmd.GITCOMMIT=${GIT_COMMIT}" -o bin/kompose
src/${EGO_PN}/main.go || die
-}
-
-src_install() {
- dobin bin/*
- dodoc -r
src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.19.0.ebuild
b/app-emulation/kompose/kompose-1.19.0.ebuild
deleted file mode 100644
index d6b2bc22f6a..000
--- a/app-emulation/kompose/kompose-1.19.0.ebuild
+++ /dev/null
@@ -1,30
[gentoo-commits] repo/gentoo:master commit in: dev-lua/lgi/
commit: 0e95c6e912a781a82fa7394ca5a4aa0dc92b2b8b
Author: Robin H. Johnson gentoo org>
AuthorDate: Sun Nov 29 00:27:10 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sun Nov 29 00:28:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e95c6e9
dev-lua/lgi: revbump with slotted lua support
Builds & passes all src_test runs with Xvfb on lua5.1..5.3.
Not tested with luajit, but presumed to work.
Signed-off-by: Robin H. Johnson gentoo.org>
dev-lua/lgi/lgi-0.9.2-r100.ebuild | 124 ++
1 file changed, 124 insertions(+)
diff --git a/dev-lua/lgi/lgi-0.9.2-r100.ebuild
b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
new file mode 100644
index 000..908e5804dfb
--- /dev/null
+++ b/dev-lua/lgi/lgi-0.9.2-r100.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="manual"
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua eutils toolchain-funcs flag-o-matic virtualx
+
+DESCRIPTION="Lua bindings using gobject-introspection"
+HOMEPAGE="https://github.com/pavouk/lgi;
+SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+BDEPEND="${LUA_DEPS}"
+RDEPEND="${LUA_DEPS}
+ dev-libs/gobject-introspection
+ dev-libs/glib
+ dev-libs/libffi:0="
+DEPEND="${RDEPEND}
+ test? (
+ x11-libs/cairo[glib]
+ x11-libs/gtk+[introspection]
+ ${VIRTUALX_DEPEND}
+ )"
+
+lua_src_prepare() {
+ pushd "${BUILD_DIR}" || die
+ # The Makefile & several source files use the LUA version as part of the
+ # direct filename, dynamically created, and we respect that.
+ _slug=${ELUA}
+ _slug=${_slug/.}
+ _slug=${_slug/-}
+ _slug=${_slug/_}
+
+ # Makefile: CORE = corelgilua51.so (and similar lines)
+ sed -r -i \
+ -e "/^CORE\>/s,lua5.,${_slug},g" \
+ lgi/Makefile \
+ || die "sed failed"
+
+ # ./lgi/core.lua:local core = require 'lgi.corelgilua51'
+ # ./lgi/core.c:luaopen_lgi_corelgilua51 (lua_State* L)
+ sed -r -i \
+ -e "/lgi.corelgilua5./s,lua5.,${_slug},g" \
+ lgi/core.lua \
+ lgi/core.c \
+ || die "sed failed"
+
+ # Verify the change as it's important!
+ for f in lgi/core.lua lgi/core.c lgi/Makefile ; do
+ grep -sq "corelgi${_slug}" "${f}" || die "Failed to sed .lua &
.c for corelgi${_slug}: ${f}"
+ done
+
+ # Cleanup
+ unset _slug
+ popd
+}
+
+src_prepare() {
+ default
+ lua_copy_sources
+ lua_foreach_impl lua_src_prepare
+}
+
+lgi_emake_wrapper() {
+ emake \
+ CC="$(tc-getCC)" \
+ COPTFLAGS="-Wall -Wextra ${CFLAGS}" \
+ LIBFLAG="-shared ${LDFLAGS}" \
+ LUA_CFLAGS="$(lua_get_CFLAGS)" \
+ LUA="${LUA}" \
+ LUA_VERSION="${ELUA#lua}" \
+ LUA_LIBDIR="$(lua_get_cmod_dir)" \
+ LUA_SHAREDIR="$(lua_get_lmod_dir)" \
+ "$@"
+}
+
+lua_src_compile() {
+ pushd "${BUILD_DIR}" || die
+ lgi_emake_wrapper all
+ popd
+}
+
+src_compile() {
+ lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+ pushd "${BUILD_DIR}" || die
+ virtx \
+ lgi_emake_wrapper \
+ check
+ popd
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ pushd "${BUILD_DIR}" || die
+ lgi_emake_wrapper \
+ DESTDIR="${D}" \
+ install
+ popd
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+ docompress -x /usr/share/doc/${PF}
+ dodoc README.md
+ dodoc -r docs/*
+ if use examples; then
+ dodoc -r samples
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: ea7a9f873c2293d788cb8385215254a96d3093f6 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Nov 29 00:25:50 2020 + Commit: Robin H. Johnson gentoo org> CommitDate: Sun Nov 29 00:28:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea7a9f87 profiles: add slotted-lua dev-lua/lgi to package.mask Signed-off-by: Robin H. Johnson gentoo.org> profiles/package.mask | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index ccb058f6cd7..23342c0de62 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -501,6 +501,7 @@ dev-lua/luacrypto # Added sci-visualization/gnuplot. # Robin H. Johnson (2020-11-28) # Added dev-lua/lpeg +# Added dev-lua/lgi >=app-admin/conky-1.11.4 >=app-benchmarks/sysbench-1.0.20-r100 >=app-benchmarks/wrk-4.1.0-r100 @@ -553,6 +554,7 @@ dev-lua/luacrypto >=www-client/elinks-0.13.5-r100 >=www-servers/lighttpd-1.4.55-r100 >=dev-lua/lpeg-1.0.2-r100 +>=dev-lua/lgi-0.9.2-r100 # Andrew Savchenko (2020-10-11) # Mask old openafs version and corresponding openafs-kernel with
[gentoo-commits] repo/gentoo:master commit in: net-ftp/gproftpd/
commit: 7d7006e325f99c0fce571d49d8aa57b6dab009fd
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:33:59 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7006e3
net-ftp/gproftpd: stable 8.3.2-r2 for sparc, bug #757174
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
index 9f6648c9fb7..d3f36f9a9aa 100644
--- a/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
+++ b/net-ftp/gproftpd/gproftpd-8.3.2-r2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="GTK frontend to proftpd"
HOMEPAGE="https://mange.dynalias.org/linux/gproftpd;
SRC_URI="http://mange.dynup.net/linux/gproftpd/${P}.tar.gz;
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
SLOT="0"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/open4/
commit: cd21d1a61c56c17c9050f36fa05259b0f1ebeda7 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sat Nov 28 23:37:24 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Nov 29 00:13:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd21d1a6 dev-ruby/open4: keyworded 1.3.4 for hppa, bug #743661 Package-Manager: Portage-3.0.9, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-ruby/open4/open4-1.3.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild index 3184e7f55d2..0af235c1635 100644 --- a/dev-ruby/open4/open4-1.3.4.ebuild +++ b/dev-ruby/open4/open4-1.3.4.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4; LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="" ruby_add_bdepend "test? ( dev-ruby/minitest )"
[gentoo-commits] repo/gentoo:master commit in: dev-util/aruba/
commit: efa0654eebc39ddb107699458e398b7a8dad73fd
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:38:25 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa0654e
dev-util/aruba: keyworded 1.0.3-r1 for hppa, bug #743661
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-util/aruba/aruba-1.0.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-util/aruba/aruba-1.0.3-r1.ebuild
b/dev-util/aruba/aruba-1.0.3-r1.ebuild
index 02c6b6cb9ab..c9d582ff382 100644
--- a/dev-util/aruba/aruba-1.0.3-r1.ebuild
+++ b/dev-util/aruba/aruba-1.0.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/aruba;
SRC_URI="https://github.com/cucumber/aruba/archive/v${PV}.tar.gz ->
${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
SLOT="$(ver_cut 1)"
IUSE=""
[gentoo-commits] repo/gentoo:master commit in: dev-python/re-assert/
commit: e64f5fbc079ae0ad9d2ccaf436a3f9d7284cb969
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:36:57 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e64f5fbc
dev-python/re-assert: keyworded 1.1.0 for hppa, bug #752228
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-python/re-assert/re-assert-1.1.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild
b/dev-python/re-assert/re-assert-1.1.0.ebuild
index 65208146a66..b608989851e 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
[gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/
commit: 5ab7cbe7263f74d75f64b71bdf3f9627424b46e9
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:35:57 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab7cbe7
dev-python/lxml: stable 4.6.2 for sparc, bug #757117
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-python/lxml/lxml-4.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/lxml/lxml-4.6.2.ebuild
b/dev-python/lxml/lxml-4.6.2.ebuild
index 1a7bf27b9c5..94f6da0f707 100644
--- a/dev-python/lxml/lxml-4.6.2.ebuild
+++ b/dev-python/lxml/lxml-4.6.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-dns/ldns-utils/
commit: d42420c5e4762fa72693fb6fd5968e0bcc9f63ec
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:35:07 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d42420c5
net-dns/ldns-utils: stable 1.7.1 for sparc, bug #757153
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-dns/ldns-utils/ldns-utils-1.7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
index b51adb0c072..ca0ac910a7c 100644
--- a/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
+++ b/net-dns/ldns-utils/ldns-utils-1.7.1.ebuild
@@ -11,7 +11,7 @@
SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz;
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
sparc x86"
IUSE="+dane ecdsa ed25519 ed448 examples gost ssl"
REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/pry/
commit: 8b9864aac81f3734bb6ba17e3ff4d6c5ca1c7ec2 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sat Nov 28 23:37:52 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Nov 29 00:13:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9864aa dev-ruby/pry: keyworded 0.13.1 for hppa, bug #743661 Package-Manager: Portage-3.0.9, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> dev-ruby/pry/pry-0.13.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/pry/pry-0.13.1.ebuild b/dev-ruby/pry/pry-0.13.1.ebuild index c8dfd0ca4f1..a6ccfb80e17 100644 --- a/dev-ruby/pry/pry-0.13.1.ebuild +++ b/dev-ruby/pry/pry-0.13.1.ebuild @@ -19,7 +19,7 @@ IUSE="" SLOT="ruby19" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" ruby_add_rdepend " >=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
[gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/
commit: 54894dbecc22c07d3e33e632d6f33373ef182f52
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:34:34 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54894dbe
net-dns/idnkit: stable 2.3 for sparc, bug #757162
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-dns/idnkit/idnkit-2.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index ddff15c12c1..8d9584b8439 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://jprs.co.jp/idn/${P}.tar.bz2;
LICENSE="JPRS"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
sparc x86"
IUSE="liteonly static-libs"
RDEPEND="
virtual/libiconv
[gentoo-commits] repo/gentoo:master commit in: net-libs/libsmi/
commit: 6d00b8fbe0b0d4269d777aa12b4efd56716378b6
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:33:18 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d00b8fb
net-libs/libsmi: stable 0.5.0-r1 for sparc, bug #757192
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-libs/libsmi/libsmi-0.5.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
index b7fd8832d13..2fff4848015 100644
--- a/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
+++ b/net-libs/libsmi/libsmi-0.5.0-r1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://www.ibr.cs.tu-bs.de/projects/libsmi/download/${P}.tar.gz;
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
IUSE="static-libs"
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: net-misc/wakeonlan/
commit: d6116e89b6e01706c405a4759bf4167303d6bbf1
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:30:59 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6116e89
net-misc/wakeonlan: stable 0.41-r3 for sparc, bug #757237
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
index 2ac0dc29d53..73024975d75 100644
--- a/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
+++ b/net-misc/wakeonlan/wakeonlan-0.41-r3.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/jpoliv/wakeonlan/archive/${P}.tar.gz;
LICENSE="Artistic GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
[gentoo-commits] repo/gentoo:master commit in: net-misc/netifrc/
commit: 7a234446aace921b1273fba4cb4af376a6fb62f1
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:31:38 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a234446
net-misc/netifrc: stable 0.7.1-r1 for sparc, bug #757222
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-misc/netifrc/netifrc-0.7.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
index 4fc9c170622..78862ef6cc8 100644
--- a/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
+++ b/net-misc/netifrc/netifrc-0.7.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "" ]]; then
inherit git-r3
else
SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 sparc x86"
fi
LICENSE="BSD-2"
[gentoo-commits] repo/gentoo:master commit in: net-misc/ipcalc/
commit: d345093af0d311ccb15e7d634bc6126aa8375fa6
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:32:46 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d345093a
net-misc/ipcalc: stable 0.42_p2 for sparc, bug #757210
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-misc/ipcalc/ipcalc-0.42_p2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
index bac7f1cb48f..6e05f31ea17 100644
--- a/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
+++ b/net-misc/ipcalc/ipcalc-0.42_p2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
SLOT="0"
RDEPEND=">=dev-lang/perl-5.6.0"
[gentoo-commits] repo/gentoo:master commit in: dev-python/psutil/
commit: e99eec16b5c662f83b2b894c0088f3d2a92bd86f
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:30:23 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e99eec16
dev-python/psutil: stable 5.7.3 for sparc, bug #756568
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-python/psutil/psutil-5.7.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/psutil/psutil-5.7.3.ebuild
b/dev-python/psutil/psutil-5.7.3.ebuild
index c6e735c5f82..2e7ad9a12ef 100644
--- a/dev-python/psutil/psutil-5.7.3.ebuild
+++ b/dev-python/psutil/psutil-5.7.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: net-misc/keychain/
commit: a460022c6b61ea2248605878f3a2143562ab1238
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Nov 28 23:32:12 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Nov 29 00:13:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a460022c
net-misc/keychain: stable 2.8.5 for sparc, bug #757213
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
net-misc/keychain/keychain-2.8.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild
b/net-misc/keychain/keychain-2.8.5.ebuild
index 4de9af19d8c..752f6099ce7 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc
x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc
x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/perl"
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: 4a0d8b5637db7d64811d9cfe1d6746d2baf63150 Author: Jason Zaman gentoo org> AuthorDate: Sat Nov 28 23:30:04 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 23:30:04 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=4a0d8b56 init: remove gentoo-specific rules that have been upstreamed Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/init.fc | 20 1 file changed, 20 deletions(-) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index c8451701..567bc960 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -95,23 +95,3 @@ ifdef(`distro_suse', ` /run/setleds-on-- gen_context(system_u:object_r:initrc_runtime_t,s0) /run/sysconfig(/.*)? gen_context(system_u:object_r:initrc_runtime_t,s0) ') - -ifdef(`distro_gentoo',` -# -# /lib -# -/usr/lib/rc/console(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/usr/lib/rc/cache(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) - -# -# /sbin -# -/usr/sbin/openrc -- gen_context(system_u:object_r:rc_exec_t,s0) - -# -# /var -# -/var/lib/ip6?tables(/.*)? gen_context(system_u:object_r:initrc_tmp_t,s0) - -/run/openrc(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -')
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/lua-utf8/
commit: 6d510f813a21e6f327ab7e1e160ef35696aeec80
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 23:56:02 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:59:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d510f81
dev-lua/lua-utf8: migrate to lua eclass
Closes: https://bugs.gentoo.org/752627
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild | 82 +
profiles/package.mask | 1 +
2 files changed, 83 insertions(+)
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
new file mode 100644
index 000..48e0614d06d
--- /dev/null
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A UTF-8 support module for Lua and LuaJIT"
+HOMEPAGE="https://github.com/starwing/luautf8;
+SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN//-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+lua_src_compile() {
+ local compiler=(
+ "$(tc-getCC)"
+ "${CFLAGS}"
+ "-fPIC"
+ "${LDFLAGS}"
+ "$(lua_get_CFLAGS)"
+ "-c lutf8lib.c"
+ "-o lutf8lib-${ELUA}.o"
+ )
+ einfo "${compiler[@]}"
+ ${compiler[@]} || die
+
+ local linker=(
+ "$(tc-getCC)"
+ "-shared"
+ "${LDFLAGS}"
+ "-o lutf8lib-${ELUA}.so"
+ "lutf8lib-${ELUA}.o"
+ )
+ einfo "${linker[@]}"
+ ${linker[@]} || die
+}
+
+src_compile() {
+ lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+ local mytests=(
+ "test.lua"
+ "test_compat.lua"
+ "test_pm.lua"
+ )
+
+ for mytest in ${mytests[@]}; do
+ LUA_CPATH="${S}/lutf8lib-${ELUA}.so" ${ELUA} ${mytest} || die
+ done
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ exeinto "$(lua_get_cmod_dir)"
+ newexe "lutf8lib-${ELUA}.so" "lua-utf8.so"
+
+ insinto "$(lua_get_lmod_dir)"
+ doins parseucd.lua
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+
+ einstalldocs
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index a884e70e9e5..ccb058f6cd7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -513,6 +513,7 @@ dev-lua/luacrypto
>=dev-lua/ldoc-1.4.6-r100
>=dev-lua/lpeg-1.0.2-r100
>=dev-lua/lua-bit32-5.3.5-r100
+>=dev-lua/lua-utf8-0.1.3-r100
>=dev-lua/lua-zlib-1.2-r100
>=dev-lua/LuaBitOp-1.0.2-r100
>=dev-lua/luadbi-0.7.2-r100
[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-utf8/, dev-lua/lua-utf8/files/
commit: 79580bac1382aa10ef091c1b01f5da5b69c2aee2
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 23:57:38 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:59:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79580bac
dev-lua/lua-utf8: drop old version
Closes: https://bugs.gentoo.org/730464
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/lua-utf8/Manifest| 1 -
dev-lua/lua-utf8/files/lua-utf8.Makefile | 42 --
dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild | 44
3 files changed, 87 deletions(-)
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index b31cd98e6e8..922b0276858 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,2 +1 @@
-DIST lua-utf8-0.1.1.tar.gz 35475 BLAKE2B
99ffece901878fc966e0314886ca20255834c76b9266b1806acda7afb84d6a358c556b9a88c10497d2874d7902fac5905907ab25fefb4ba38544d46e3bae1471
SHA512
e0a8632b9391c7e7b35e371f4e95899ec58adb4988f1fe5a7101310f7c774c3a3e88073f156cf7799c57f69c0fc53aff4486beb1e7006bfaa96d86e248e38897
DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B
72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c
SHA512
d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
diff --git a/dev-lua/lua-utf8/files/lua-utf8.Makefile
b/dev-lua/lua-utf8/files/lua-utf8.Makefile
deleted file mode 100644
index 456c52f4aaa..000
--- a/dev-lua/lua-utf8/files/lua-utf8.Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# this file builds lua-utf8
-
-MY_USE_LUA?=luajit
-PKG_CONFIG?=pkg-config
-PREFIX?=/usr/local
-DESTDIR?=/
-
-LUA_LIBDIR := $(shell $(PKG_CONFIG) --variable INSTALL_CMOD $(MY_USE_LUA))
-LUA_INC := $(shell $(PKG_CONFIG) --variable INSTALL_INC $(MY_USE_LUA))
-LUA_SHARE := $(shell $(PKG_CONFIG) --variable INSTALL_LMOD $(MY_USE_LUA))
-CWARNS := -Wall -pedantic
-CFLAGS += -I$(LUA_INC) -fPIC $(CWARNS)
-LIB_OPTION := -shared
-LDFLAGS += $(LIB_OPTION)
-
-SONAME := lua-utf8.so
-SONAMEV := $(SONAME).0
-LIBRARY := $(SONAMEV).1.1
-SRC := lutf8lib.c
-OBJ := $(patsubst %.c, %.o, $(SRC))
-
-FILES := parseucd.lua
-
-all: $(LIBRARY) $(SONAMEV) $(SONAME)
-
-$(SONAMEV):
- ln -s $(LIBRARY) $@
-
-$(SONAME):
- ln -s $(SONAMEV) $@
-
-$(LIBRARY): $(OBJ)
- $(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJ) -lc
-
-install:
- install -d $(DESTDIR)$(LUA_LIBDIR)
- install $(SONAME) $(DESTDIR)$(LUA_LIBDIR)
- install -d $(DESTDIR)$(LUA_SHARE)
- install --mode=0444 $(FILES) $(DESTDIR)$(LUA_SHARE)
-
-clean:
- rm -rf $(LIBRARY) $(SONAMEV) $(SONAME) *.o
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
b/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
deleted file mode 100644
index d3dffeb9e9f..000
--- a/dev-lua/lua-utf8/lua-utf8-0.1.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="UTF-8 support for Lua"
-HOMEPAGE="https://github.com/starwing/luautf8;
-SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64"
-IUSE="luajit test"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- !luajit? ( >=dev-lang/lua-5.1:= )
- luajit? ( dev-lang/luajit:2 )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN//-/}-${PV}"
-
-src_prepare() {
- default
-
- cp -v "${FILESDIR}/${PN}".Makefile "${S}"/Makefile || die
-}
-
-src_compile() {
- tc-export CC
- emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit
'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}" MY_USE_LUA="$(usex luajit
'luajit' 'lua')" PKG_CONFIG="$(tc-getPKG_CONFIG)" install
- einstalldocs
-}
-
-src_test() {
- LUA_CPATH=./?.so $(usex luajit 'luajit' 'lua') test.lua || die
-}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/lua-utf8/
commit: 3ab31025ddbf0c54f8d786ace06e0ff8be1aaf9a
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 23:53:09 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:59:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab31025
dev-lua/lua-utf8: bump to version 0.1.3
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/lua-utf8/Manifest | 1 +
dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild | 70 ++
dev-lua/lua-utf8/metadata.xml | 4 ++
3 files changed, 75 insertions(+)
diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index b2369602833..b31cd98e6e8 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1 +1,2 @@
DIST lua-utf8-0.1.1.tar.gz 35475 BLAKE2B
99ffece901878fc966e0314886ca20255834c76b9266b1806acda7afb84d6a358c556b9a88c10497d2874d7902fac5905907ab25fefb4ba38544d46e3bae1471
SHA512
e0a8632b9391c7e7b35e371f4e95899ec58adb4988f1fe5a7101310f7c774c3a3e88073f156cf7799c57f69c0fc53aff4486beb1e7006bfaa96d86e248e38897
+DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B
72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c
SHA512
d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
new file mode 100644
index 000..ef773e7a908
--- /dev/null
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A UTF-8 support module for Lua and LuaJIT"
+HOMEPAGE="https://github.com/starwing/luautf8;
+SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN//-/}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="luajit test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ luajit? ( dev-lang/luajit:2 )
+ !luajit? ( >=dev-lang/lua-5.1:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+ local compiler=(
+ "$(tc-getCC)"
+ "${CFLAGS}"
+ "-fPIC"
+ "${LDFLAGS}"
+ "-I/usr/include"
+ "-c lutf8lib.c"
+ "-o lutf8lib.o"
+ )
+ einfo "${compiler[@]}"
+ ${compiler[@]} || die
+
+ local linker=(
+ "$(tc-getCC)"
+ "-shared"
+ "${LDFLAGS}"
+ "-o lutf8lib.so"
+ "lutf8lib.o"
+ )
+ einfo "${linker[@]}"
+ ${linker[@]} || die
+}
+
+src_test() {
+ local mytests=(
+ "test.lua"
+ "test_compat.lua"
+ "test_pm.lua"
+ )
+
+ for mytest in ${mytests[@]}; do
+ LUA_CPATH="${S}/lutf8lib.so" $(usex luajit 'luajit' 'lua')
${mytest} || die
+ done
+}
+
+src_install() {
+ exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+ newexe "lutf8lib.so" "lua-utf8.so"
+
+ insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+ doins parseucd.lua
+
+ einstalldocs
+}
diff --git a/dev-lua/lua-utf8/metadata.xml b/dev-lua/lua-utf8/metadata.xml
index efc3ff44560..e9b8d834be8 100644
--- a/dev-lua/lua-utf8/metadata.xml
+++ b/dev-lua/lua-utf8/metadata.xml
@@ -1,6 +1,10 @@
http://www.gentoo.org/dtd/metadata.dtd;>
+
+ conik...@gentoo.org
+ Conrad Kostecki
+
vpayno+gen...@gmail.com
Victor Payno
[gentoo-commits] repo/gentoo:master commit in: dev-lua/LuaBitOp/
commit: 15fee9e739356e5c1248e2a932c105579e466c00
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 23:28:40 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:28:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15fee9e7
dev-lua/LuaBitOp: drop old version
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild | 44 ---
1 file changed, 44 deletions(-)
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
deleted file mode 100644
index e56c2587e41..000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Bit Operations Library for the Lua Programming Language"
-HOMEPAGE="http://bitop.luajit.org;
-SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:*[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- multilib_copy_sources
-}
-
-multilib_src_compile()
-{
- emake CC="$(tc-getCC)" INCLUDES= CCOPT=
-}
-
-multilib_src_test() {
- # tests use native lua interpreter
- multilib_is_native_abi && default
-}
-
-multilib_src_install()
-{
- local instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
- exeinto "${instdir#${EPREFIX}}"
- doexe bit.so
-}
-
-multilib_src_install_all() {
- dodoc README
- dohtml -r doc/.
-}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/LuaBitOp/files/, dev-lua/LuaBitOp/
commit: 13a998e3b45cb15be5b27f9fc4f5f09418a722fe
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 22:34:21 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:25:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a998e3
dev-lua/LuaBitOp: drop old version
Dropping hppa to testing, so all old version can be removed.
Closes: https://bugs.gentoo.org/501164
Closes: https://bugs.gentoo.org/513886
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild | 43 ---
dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild| 32
dev-lua/LuaBitOp/Manifest | 1 -
dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch | 13
4 files changed, 89 deletions(-)
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
b/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
deleted file mode 100644
index e09c0248941..000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Bit Operations Library for the Lua Programming Language"
-HOMEPAGE="http://bitop.luajit.org;
-SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="=dev-lang/lua-5.1*"
-RDEPEND="${DEPEND}"
-
-src_prepare()
-{
- sed -i \
- -e '/^CFLAGS.*=/s/=/ +=/' \
- -e '/^CFLAGS/s/-O2 -fomit-frame-pointer //' \
- Makefile || die "sed failed"
- epatch "${FILESDIR}/${PN}-ldflags.patch"
-}
-
-src_compile()
-{
- emake CC="$(tc-getCC)"
-}
-
-src_test()
-{
- make test
-}
-
-src_install()
-{
- exeinto /usr/$(get_libdir)/lua/5.1
-doexe bit.so
- dohtml -r doc/*
-}
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
b/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
deleted file mode 100644
index 66d3e88a1af..000
--- a/dev-lua/LuaBitOp/LuaBitOp-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit toolchain-funcs
-
-DESCRIPTION="Bit Operations Library for the Lua Programming Language"
-HOMEPAGE="http://bitop.luajit.org;
-SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~mips x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_compile()
-{
- emake CC="$(tc-getCC)" INCLUDES= CCOPT=
-}
-
-src_install()
-{
- exeinto "$(pkg-config --variable INSTALL_CMOD lua)"
- doexe bit.so
-
- dodoc README
- dohtml -r doc/*
-}
diff --git a/dev-lua/LuaBitOp/Manifest b/dev-lua/LuaBitOp/Manifest
index 3a2561aa1e7..257d385c72f 100644
--- a/dev-lua/LuaBitOp/Manifest
+++ b/dev-lua/LuaBitOp/Manifest
@@ -1,2 +1 @@
-DIST LuaBitOp-1.0.1.tar.gz 22984 BLAKE2B
f4c7517e92cb11e7486c8a18e029374a635fda9c368ce9d160485a32b3ad3e63046c1183924d8a432b07e58607867c0e937d7dade4857842456d15778adccc8c
SHA512
de326ba899b70ea01c41b02d26b1a5afd07bdeee5628be7cbeaa438452ac4343cab01494ac3e5e6758365de15c5cb9c211e17f2e4dd1e0e9258979d06018c71e
DIST LuaBitOp-1.0.2.tar.gz 23127 BLAKE2B
97b2ded135903f7bf2165a03d611fc2864336929706eb67097b5d67d0a0ec156c855a1637bc309d8dd03cb68beeda350b33eed7678b82540da54502cf981333a
SHA512
a652050ea5c6fbeb8a28b05e2bc4a3550c854cc45f7f42c8c1b0a81f5b76773cdf061e6a839cdb339614118169e578b6e3efa5a3efbe59a2f01874b2fa2b4f2e
diff --git a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
b/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
deleted file mode 100644
index 2a690cdb586..000
--- a/dev-lua/LuaBitOp/files/LuaBitOp-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: LuaBitOp-1.0.1/Makefile
-===
LuaBitOp-1.0.1.orig/Makefile
-+++ LuaBitOp-1.0.1/Makefile
-@@ -14,7 +14,7 @@ LUA= lua
-
- CC= gcc
- SOCFLAGS= -fPIC
--SOCC= $(CC) -shared $(SOCFLAGS)
-+SOCC= $(CC) -shared $(SOCFLAGS) $(LDFLAGS)
- CFLAGS += -Wall $(SOCFLAGS) $(DEFINES) $(INCLUDES)
- RM= rm -f
- INSTALL= install -p
[gentoo-commits] repo/gentoo:master commit in: dev-lua/LuaBitOp/
commit: 82f2636f13ae0f8d8e073c89392b88caaa0d9781
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 22:37:56 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:25:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f2636f
dev-lua/LuaBitOp: depend on lua-5.1
Changing RDEPEND to lua-5.1 non slotted, as we will have a new version
in future, which will be used for slotted lua.
Closes: https://bugs.gentoo.org/739916
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild | 44 +++
1 file changed, 44 insertions(+)
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
new file mode 100644
index 000..67165da21a3
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Bit Operations Library for the Lua Programming Language"
+HOMEPAGE="http://bitop.luajit.org;
+SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ multilib_copy_sources
+}
+
+multilib_src_compile()
+{
+ emake CC="$(tc-getCC)" INCLUDES= CCOPT=
+}
+
+multilib_src_test() {
+ # tests use native lua interpreter
+ multilib_is_native_abi && default
+}
+
+multilib_src_install()
+{
+ local instdir="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+ exeinto "${instdir#${EPREFIX}}"
+ doexe bit.so
+}
+
+multilib_src_install_all() {
+ dodoc README
+ dohtml -r doc/.
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lua/LuaBitOp/, profiles/
commit: c5bec926988c2fe7b607b43b97d3934a95f1fdf1
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 23:24:37 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 23:25:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5bec926
dev-lua/LuaBitOp: migrate to lua eclass
Closes: https://bugs.gentoo.org/752600
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild | 84 +
dev-lua/LuaBitOp/metadata.xml | 4 ++
profiles/package.mask | 1 +
3 files changed, 89 insertions(+)
diff --git a/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
new file mode 100644
index 000..c7fc464de59
--- /dev/null
+++ b/dev-lua/LuaBitOp/LuaBitOp-1.0.2-r100.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="Bit Operations Library for the Lua Programming Language"
+HOMEPAGE="http://bitop.luajit.org;
+SRC_URI="http://bitop.luajit.org/download/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/." )
+
+src_prepare() {
+ default
+
+ multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+ # Clean project, to compile it for every lua slot
+ emake clean
+
+ local myemakeargs=(
+ "CC=$(tc-getCC)"
+ "CCOPT="
+ "INCLUDES=$(lua_get_CFLAGS)"
+ )
+
+ emake "${myemakeargs[@]}" all
+
+ # Copy module to match the choosen LUA implementation
+ cp "bit.so" "${S}/bit-${ELUA}.so" || die
+}
+
+multilib_src_compile() {
+ lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_test() {
+ local mytests=(
+ "bitbench.lua"
+ "bittest.lua"
+ "md5test.lua"
+ "nsievebits.lua"
+ )
+
+ for mytest in ${mytests[@]}; do
+ LUA_CPATH="${S}/bit-${ELUA}.so" ${ELUA} ${mytest}
+ done
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && lua_foreach_impl lua_multilib_src_test
+}
+
+lua_multilib_src_install() {
+ # Use correct module for the choosen LUA implementation
+ cp "${S}/bit-${ELUA}.so" "bit.so" || die
+
+ exeinto $(lua_get_cmod_dir)
+ doexe bit.so
+}
+
+multilib_src_install() {
+ lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
diff --git a/dev-lua/LuaBitOp/metadata.xml b/dev-lua/LuaBitOp/metadata.xml
index c36c37139fa..8105c04d111 100644
--- a/dev-lua/LuaBitOp/metadata.xml
+++ b/dev-lua/LuaBitOp/metadata.xml
@@ -5,4 +5,8 @@
willi...@gentoo.org
William Hubbs
+
+ conik...@gentoo.org
+ Conrad Kostecki
+
diff --git a/profiles/package.mask b/profiles/package.mask
index 8b8b7b0c759..a884e70e9e5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -514,6 +514,7 @@ dev-lua/luacrypto
>=dev-lua/lpeg-1.0.2-r100
>=dev-lua/lua-bit32-5.3.5-r100
>=dev-lua/lua-zlib-1.2-r100
+>=dev-lua/LuaBitOp-1.0.2-r100
>=dev-lua/luadbi-0.7.2-r100
>=dev-lua/luaevent-0.4.6-r100
=dev-lua/luaexpat-1.3.0-r100
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 0095b95fccd6e1fe40d892fec5d749a24069e1cb Author: Robin H. Johnson gentoo org> AuthorDate: Sat Nov 28 22:49:00 2020 + Commit: Robin H. Johnson gentoo org> CommitDate: Sat Nov 28 23:12:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0095b95f profiles: add slotted-lua dev-lua/lpeg to package.mask Signed-off-by: Robin H. Johnson gentoo.org> profiles/package.mask | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index daf7ed3e732..8b8b7b0c759 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -499,6 +499,8 @@ dev-lua/luacrypto # All these ebuilds require slotted Lua, which is still masked. # Ulrich Müller (2020-11-06) # Added sci-visualization/gnuplot. +# Robin H. Johnson (2020-11-28) +# Added dev-lua/lpeg >=app-admin/conky-1.11.4 >=app-benchmarks/sysbench-1.0.20-r100 >=app-benchmarks/wrk-4.1.0-r100 @@ -548,6 +550,7 @@ dev-lua/luacrypto >=www-apache/mod_security-2.9.3-r100 >=www-client/elinks-0.13.5-r100 >=www-servers/lighttpd-1.4.55-r100 +>=dev-lua/lpeg-1.0.2-r100 # Andrew Savchenko (2020-10-11) # Mask old openafs version and corresponding openafs-kernel with
[gentoo-commits] repo/gentoo:master commit in: dev-lua/lpeg/
commit: 1a6dc03ce8e11606e794ea6d187771e18432153c
Author: Robin H. Johnson gentoo org>
AuthorDate: Sat Nov 28 22:51:00 2020 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Sat Nov 28 23:12:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a6dc03c
dev-lua/lpeg: revbump with slotted lua support
Signed-off-by: Robin H. Johnson gentoo.org>
dev-lua/lpeg/lpeg-1.0.2-r101.ebuild | 79 +
1 file changed, 79 insertions(+)
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
new file mode 100644
index 000..10a6b94a1b4
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2-r101.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/;
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test debug doc"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ test? ( ${RDEPEND} )
+"
+
+DOCS=( HISTORY )
+HTML_DOCS=( lpeg.html re.html )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-makefile.patch )
+
+lua_src_prepare() {
+ if ! test -d "${S}.${ELUA}/" ; then
+ cp -ral "${S}/" "${S}.${ELUA}/" || die
+ fi
+}
+
+src_prepare() {
+ default
+ use debug && append-cflags -DLPEG_DEBUG
+ lua_foreach_impl lua_src_prepare
+}
+
+lua_src_compile() {
+ cd "${S}.${ELUA}/" || die
+ emake CC="$(tc-getCC)" \
+ LUADIR="$(lua_get_include_dir)"
+}
+
+src_compile() {
+ lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+ cd "${S}.${ELUA}/" || die
+ ${ELUA} test.lua || die
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ cd "${S}.${ELUA}/" || die
+ local instdir
+ instdir="$(lua_get_cmod_dir)"
+ exeinto "${instdir#${EPREFIX}}"
+ doexe lpeg.so
+ instdir="$(lua_get_lmod_dir)"
+ insinto "${instdir#${EPREFIX}}"
+ doins re.lua
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+ cd "${S}" || die
+ use doc && einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/srf/, dev-lang/srf/files/
commit: cbbaf8e8744ecbfad9ee7159d00ea7d589e1de0f
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:49 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbbaf8e8
dev-lang/srf: fix build with gcc-10
Closes: https://bugs.gentoo.org/712054
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
dev-lang/srf/files/srf-1.0-fno-common.patch | 8
dev-lang/srf/srf-1.0-r2.ebuild | 9 -
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/dev-lang/srf/files/srf-1.0-fno-common.patch
b/dev-lang/srf/files/srf-1.0-fno-common.patch
new file mode 100644
index 000..abbd5c74191
--- /dev/null
+++ b/dev-lang/srf/files/srf-1.0-fno-common.patch
@@ -0,0 +1,8 @@
+--- a/builtins.h
b/builtins.h
+@@ -20,4 +20,4 @@
+ */
+ #ident "$Id: builtins.h,v 1.4 2004/11/02 04:39:39 bediger Exp $"
+ void setup_builtins(void);
+-int primitive_call_counter;
++extern int primitive_call_counter;
diff --git a/dev-lang/srf/srf-1.0-r2.ebuild b/dev-lang/srf/srf-1.0-r2.ebuild
index 75e62c66f6f..949fee4692d 100644
--- a/dev-lang/srf/srf-1.0-r2.ebuild
+++ b/dev-lang/srf/srf-1.0-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils vcs-clean
+inherit vcs-clean
DESCRIPTION="The Simple Recursive Functions programming language"
HOMEPAGE="http://www.stratigery.com/srf.html;
@@ -12,12 +12,12 @@ SRC_URI="http://www.stratigery.com/srf.html/${P}.tar.gz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
DEPEND="
sys-devel/flex
virtual/yacc"
-RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_prepare() {
default
@@ -30,6 +30,5 @@ src_install() {
doman srf.1
dodoc README srf.html
- docinto examples
- dodoc examples/*
+ dodoc -r examples
}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/
commit: d3e99bee31a1948abb61d68092d0da987d967e9e
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:24 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e99bee
x11-terms/mrxvt: fix build with gcc-10
* Thanks to Sam James for providing the patch link
Closes: https://github.com/gentoo/gentoo/pull/18441
Closes: https://bugs.gentoo.org/707146
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch | 20 +++
x11-terms/mrxvt/mrxvt-0.5.4.ebuild | 41 +-
2 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
new file mode 100644
index 000..2bb39a423ae
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/rxvtlib.h
b/src/rxvtlib.h
+@@ -790,7 +790,7 @@ typedef struct {
+ } action_t;
+
+ /* Values for macro_t.type. Must sync this with macroNames from macros.c */
+-enum {
++enum macroFnNames {
+ MacroFnDummy=0,
+ MacroFnEsc,
+ MacroFnStr,
+@@ -820,7 +820,7 @@ enum {
+ MacroFnSaveConfig,
+ MacroFnToggleMacros,
+ NMACRO_FUNCS
+-} macroFnNames;
++};
+
+ typedef unsigned char macro_priority_t;
+ typedef struct {
diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2090e188130..dbbfd4f073d 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools eutils
+
+inherit autotools
DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK
support"
HOMEPAGE="http://materm.sourceforge.net/;
@@ -15,31 +16,37 @@ KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux
~x86-linux ~ppc-macos"
L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
-RDEPEND="png? ( media-libs/libpng )
- utempter? ( sys-libs/libutempter )
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt
jpeg? ( virtual/jpeg )
- truetype? ( x11-libs/libXft
+ png? ( media-libs/libpng:= )
+ truetype? (
media-libs/fontconfig
media-libs/freetype
- elibc_uclibc? ( dev-libs/libiconv ) )
- x11-libs/libX11
- x11-libs/libXt
- xpm? ( x11-libs/libXpm )
- x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
+ x11-libs/libXft
+ elibc_uclibc? ( dev-libs/libiconv )
+ )
+ utempter? ( sys-libs/libutempter )
+ xpm? ( x11-libs/libXpm )"
+DEPEND="
+ ${RDEPEND}
x11-base/xorg-proto"
-src_prepare() {
- eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
- eapply "${FILESDIR}"/${P}-libpng14.patch
- eapply_user
+PATCHES=(
+ "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+ "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+src_prepare() {
+ default
eautoreconf
if use elibc_uclibc && use truetype; then
# It is stated in the README "Multichar support under XFT
requires GNU iconv"
- sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/'
"${S}/src/Makefile.in"
+ sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/'
src/Makefile.in || die
fi
}
@@ -102,7 +109,7 @@ src_install() {
}
pkg_postinst() {
- if [[ -z $RXVT_TERM ]]; then
+ if [[ -z ${RXVT_TERM} ]]; then
einfo
einfo "If you experience problems with curses programs, then
this is"
einfo "most likely because of incorrectly set termcap /
terminfo"
[gentoo-commits] repo/gentoo:master commit in: www-servers/sniproxy/files/, www-servers/sniproxy/
commit: 4b9142d25d28c969e823177916b5319a8f808a7b
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:21 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b9142d2
www-servers/sniproxy: fix build with gcc-10, port to GLEP 81
Closes: https://bugs.gentoo.org/707530
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../sniproxy/files/sniproxy-0.6.0-fno-common.patch | 24 +++
...proxy-0.6.0.ebuild => sniproxy-0.6.0-r1.ebuild} | 36 +-
2 files changed, 39 insertions(+), 21 deletions(-)
diff --git a/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
new file mode 100644
index 000..f718bfca736
--- /dev/null
+++ b/www-servers/sniproxy/files/sniproxy-0.6.0-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from:
https://github.com/dlundquist/sniproxy/commit/822bb80df9b7b345cc9eba55df74a07b498819ba
+Author: Pierre-Olivier Mercier
+
+--- a/src/http.h
b/src/http.h
+@@ -29,6 +29,6 @@
+ #include
+ #include "protocol.h"
+
+-const struct Protocol *const http_protocol;
++extern const struct Protocol *const http_protocol;
+
+ #endif
+--- a/src/tls.h
b/src/tls.h
+@@ -28,6 +28,6 @@
+
+ #include "protocol.h"
+
+-const struct Protocol *const tls_protocol;
++extern const struct Protocol *const tls_protocol;
+
+ #endif
+
diff --git a/www-servers/sniproxy/sniproxy-0.6.0.ebuild
b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
similarity index 82%
rename from www-servers/sniproxy/sniproxy-0.6.0.ebuild
rename to www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
index 458f1e8ac79..9dc8e5a03ef 100644
--- a/www-servers/sniproxy/sniproxy-0.6.0.ebuild
+++ b/www-servers/sniproxy/sniproxy-0.6.0-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools user
+inherit autotools
-if [[ ${PV} == * ]]; then
+if [[ ${PV} == * ]]; then
EGIT_REPO_URI="https://github.com/dlundquist/sniproxy.git;
EGIT_BRANCH="master"
inherit git-r3
- KEYWORDS=""
else
SRC_URI="https://github.com/dlundquist/sniproxy/archive/${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
@@ -24,18 +23,18 @@ IUSE="+dns +largefile rfc3339 test"
RESTRICT="!test? ( test )"
RDEPEND="
+ acct-group/sniproxy
+ acct-user/sniproxy
dev-libs/libev
>=dev-libs/libpcre-3
- dns? ( net-libs/udns )
-"
+ dns? ( net-libs/udns )"
+DEPEND="${RDEPEND}
+ test? ( net-misc/curl )"
BDEPEND="
- ${RDEPEND}
sys-devel/gettext
- virtual/pkgconfig
-"
-DEPEND="
- test? ( net-misc/curl )
-"
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_prepare() {
default
@@ -55,6 +54,10 @@ src_configure() {
econf "${my_conf[@]}"
}
+src_test() {
+ emake -j1 check
+}
+
src_install() {
default
@@ -72,12 +75,3 @@ src_install() {
doman man/sniproxy.8
doman man/sniproxy.conf.5
}
-
-src_test() {
- emake -j1 check
-}
-
-pkg_postinst() {
- enewgroup "${PN}"
- enewuser "${PN}" -1 -1 /var/lib/sniproxy "${PN}"
-}
[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/files/, app-i18n/uim/
commit: a45dfd34d2a5ccb5a07a968a475b656b743f992e
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:46 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a45dfd34
app-i18n/uim: fix build with gcc-10
* Thanks to Jeroen Roovers for submitting the patch
Closes: https://bugs.gentoo.org/706968
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
app-i18n/uim/files/uim-1.8.8-fno-common.patch | 11 +++
app-i18n/uim/uim-1.8.8.ebuild | 1 +
2 files changed, 12 insertions(+)
diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch
b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
new file mode 100644
index 000..ff974bb5d5b
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.8-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/sigscheme/libgcroots/include/private/gc_priv.h
b/sigscheme/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+ /* the signal mask. */
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ # define SETJMP(env) hal_setjmp(env)
diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild
index 412b439ce31..3ed23be0370 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -84,6 +84,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-tinfo.patch
"${FILESDIR}"/${PN}-xkb.patch
"${FILESDIR}"/${PN}-zh-TW.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
DOCS=( AUTHORS NEWS README RELNOTE doc )
[gentoo-commits] repo/gentoo:master commit in: sys-fabric/infinipath-psm/, sys-fabric/infinipath-psm/files/
commit: ac8f2fc430322b1a6caa125e93cac120da24db62
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:18 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8f2fc4
sys-fabric/infinipath-psm: fix build with gcc-10
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/706398
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../files/infinipath-psm-3.2-fno-common.patch | 79 ++
.../infinipath-psm/infinipath-psm-3.2.ebuild | 6 +-
2 files changed, 82 insertions(+), 3 deletions(-)
diff --git
a/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
new file mode 100644
index 000..7f376f009e7
--- /dev/null
+++ b/sys-fabric/infinipath-psm/files/infinipath-psm-3.2-fno-common.patch
@@ -0,0 +1,79 @@
+Taken From:
https://build.opensuse.org/package/view_file/science:HPC:Head/infinipath-psm/Add-missing-extern-keywords.patch?expand=1
+Author: Nicolas Morey-Chaisemartin
+
+--- psm_error.h
psm_error.h
+@@ -42,7 +42,7 @@
+ #define PSMI_EP_NORETURN ((psm_ep_t) -2)
+ #define PSMI_EP_LOGEVENT ((psm_ep_t) -3)
+
+-psm_ep_errhandler_t psmi_errhandler_global;
++extern psm_ep_errhandler_t psmi_errhandler_global;
+
+ psm_error_t psmi_handle_error(psm_ep_t ep, psm_error_t error,
+ const char *buf, ...)
+--- psm_user.h
psm_user.h
+@@ -100,7 +100,7 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+ #endif
+
+ #ifdef PSMI_PLOCK_IS_SPINLOCK
+- psmi_spinlock_t psmi_progress_lock;
++ extern psmi_spinlock_t psmi_progress_lock;
+ #define PSMI_PLOCK_INIT() psmi_spin_init(_progress_lock)
+ #define PSMI_PLOCK_TRY()psmi_spin_trylock(_progress_lock)
+ #define PSMI_PLOCK() psmi_spin_lock(_progress_lock)
+@@ -109,8 +109,8 @@ psm_error_t psmi_mq_wait_internal(psm_mq_req_t *ireq);
+ #define PSMI_PUNLOCK_ASSERT()
+ #define PSMI_PLOCK_DISABLED 0
+ #elif defined(PSMI_PLOCK_IS_MUTEXLOCK_DEBUG)
+- pthread_mutex_t psmi_progress_lock;
+- pthread_t psmi_progress_lock_owner;
++ extern pthread_mutex_t psmi_progress_lock;
++ extern pthread_t psmi_progress_lock_owner;
+ #define PSMI_PLOCK_NO_OWNER ((pthread_t)(-1))
+
+ PSMI_ALWAYS_INLINE(
+--- psm_utils.h
psm_utils.h
+@@ -254,7 +254,7 @@ intpsmi_diags(void);
+ * Fault injection
+ */
+ struct psmi_faultinj_spec;
+-intpsmi_faultinj_enabled; /* use macro to test */
++extern intpsmi_faultinj_enabled; /* use macro to test */
+ #if 1 /* possible to disable at compile time */
+ #define PSMI_FAULTINJ_ENABLED() (!!psmi_faultinj_enabled)
+ #else
+--- ptl_am/ptl_fwd.h
ptl_am/ptl_fwd.h
+@@ -47,7 +47,7 @@
+ #endif
+
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_amsh;
++extern struct ptl_ctl_init psmi_ptl_amsh;
+
+ /* Special non-ptl function exposed to pre-attach to shm segment */
+ psm_error_t psmi_shm_attach(psm_ep_t ep, int *shmidx_o);
+--- ptl_ips/ptl_fwd.h
ptl_ips/ptl_fwd.h
+@@ -38,5 +38,5 @@
+ typedef struct ptl_epaddr ips_epaddr_t;
+
+ /* Symbol in ips ptl */
+-struct ptl_ctl_init psmi_ptl_ips;
++extern struct ptl_ctl_init psmi_ptl_ips;
+ #endif /* _PTL_FWD_IPS_H */
+--- ptl_self/ptl_fwd.h
ptl_self/ptl_fwd.h
+@@ -35,7 +35,7 @@
+ #define _PTL_FWD_SELF_H
+
+ /* Symbol in am ptl */
+-struct ptl_ctl_init psmi_ptl_self;
++extern struct ptl_ctl_init psmi_ptl_self;
+
+ #endif
+
+
diff --git a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
index 0654f652690..3df69cc34f9 100644
--- a/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
+++ b/sys-fabric/infinipath-psm/infinipath-psm-3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -10,11 +10,10 @@ OFED_SUFFIX="2_ga8c3e3e_open"
OFED_SNAPSHOT="1"
OFED_SRC_SNAPSHOT="1"
-inherit openib udev
+inherit epatch openib udev
DESCRIPTION="OpenIB userspace driver for the PathScale InfiniBand HCAs"
KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
RDEPEND="sys-fabric/libibverbs:${SLOT}"
DEPEND="${RDEPEND}
@@ -26,6 +25,7 @@ src_prepare() {
sed -e 's:uname -p:uname -m:g' \
-e 's:-Werror::g' \
-i buildflags.mak || die
+ epatch "${FILESDIR}"/${P}-fno-common.patch
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: sci-calculators/hcalc/files/, sci-calculators/hcalc/
commit: 2a1d01a2d1aff43310a0bf5337fcfffdaef00914
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:09 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a1d01a2
sci-calculators/hcalc: port to EAPI 7
* Thanks to Jeroen Roovers for submitting the patch.
Closes: https://bugs.gentoo.org/709722
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch | 13 +
sci-calculators/hcalc/hcalc-1.2-r1.ebuild | 9 +
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
new file mode 100644
index 000..b8bdcc73e30
--- /dev/null
+++ b/sci-calculators/hcalc/files/hcalc-1.2-fno-common.patch
@@ -0,0 +1,13 @@
+--- a/hcalc.h
b/hcalc.h
+@@ -25,8 +25,8 @@
+ extern Pixmap face;
+ extern Pixmap chars;
+
+-int bit_on;
+-int bit_off;
++extern int bit_on;
++extern int bit_off;
+
+ extern int char_to_x[256];
+ extern char charmap[];
diff --git a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
index bbd0de3fcfa..6a6b90666a0 100644
--- a/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
+++ b/sci-calculators/hcalc/hcalc-1.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils
+inherit cmake
DESCRIPTION="DJ's Hex Calculator"
HOMEPAGE="http://www.delorie.com/store/hcalc/ https://github.com/jlec/hcalc;
@@ -12,13 +12,14 @@
SRC_URI="https://github.com/downloads/jlec/hcalc/${P}.tar.xz;
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
RDEPEND="
x11-libs/libX11
x11-libs/libXpm"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
pkg_postinst() {
einfo "Enter hcalc to run and use kill or ctrl-c to exit."
}
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/, sci-electronics/xoscope/files/
commit: 0bb5bd126a41aeb8418016ad852d8d9c823ac311
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:12 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bb5bd12
sci-electronics/xoscope: bump to 2.2
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/707154
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-electronics/xoscope/Manifest | 1 +
.../xoscope/files/xoscope-2.2-fno-common.patch | 16 ++
.../xoscope/files/xoscope-2.2-man_no_-Tutf8.patch | 11 +++
sci-electronics/xoscope/xoscope-2.2.ebuild | 34 ++
4 files changed, 62 insertions(+)
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index fdab31110f0..1d4cc20517a 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,2 +1,3 @@
DIST xoscope-2.0.tgz 334875 BLAKE2B
67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7
SHA512
8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
DIST xoscope-2.1.tar.gz 302170 BLAKE2B
afd706d51fe2b63f5e948d9dafd56a16eb9368717536514f1e734909a758e585893101b0dd381ff3d45da958212f35ea76b44f4689d3242cc731cb7371913d03
SHA512
2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d
+DIST xoscope-2.2.tar.gz 307319 BLAKE2B
860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec
SHA512
77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd
diff --git a/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
new file mode 100644
index 000..124a8fdd767
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.2-fno-common.patch
@@ -0,0 +1,16 @@
+Description: Fix FTBFS with GCC 10
+Bug-Debian: https://bugs.debian.org/957990
+Forwarded:
https://sourceforge.net/p/xoscope/discussion/23485/thread/d6fba12f59/
+Author: Raymundo Cassani
+Last-Update: 2020-05-20
+
+--- a/display.c
b/display.c
+@@ -35,7 +35,6 @@
+ #define DEBUG 0
+
+ int triggered = 0; /* whether we've triggered or not */
+-void*font;
+ int math_warning = 0; /* TRUE if math has a problem */
+
+ struct signal_stats stats;
diff --git a/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
new file mode 100644
index 000..a0f54eb26e3
--- /dev/null
+++ b/sci-electronics/xoscope/files/xoscope-2.2-man_no_-Tutf8.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
b/configure.ac
+@@ -132,7 +132,7 @@ AC_DEFINE(CHANNELS, 8, [max number of channels])
+
+ AC_DEFINE(MSECREFRESH, 30, [minimum number of milliseconds between refresh on
libsx version])
+
+-AC_DEFINE(HELPCOMMAND, "man -Tutf8 xoscope 2>&1", [shell command for X11
help])
++AC_DEFINE(HELPCOMMAND, "man xoscope 2>&1", [shell command for X11 help])
+
+ AC_DEFINE(FILENAME, "oscope.dat", [default file name])
+
diff --git a/sci-electronics/xoscope/xoscope-2.2.ebuild
b/sci-electronics/xoscope/xoscope-2.2.ebuild
new file mode 100644
index 000..a51858f54bd
--- /dev/null
+++ b/sci-electronics/xoscope/xoscope-2.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+DESCRIPTION="Soundcard Oscilloscope for X"
+HOMEPAGE="http://xoscope.sourceforge.net;
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ sci-libs/fftw:3.0=
+ virtual/man
+ x11-libs/gtkdatabox"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~!SND_PCM_OSS"
+ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input
via /dev/dsp"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-man_no_-Tutf8.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/xoscope/
commit: 78fc0d72b6ac1d148f1523a12a6d0c35bc1aa3fd
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:15 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fc0d72
sci-electronics/xoscope: remove old
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-electronics/xoscope/Manifest | 1 -
sci-electronics/xoscope/xoscope-2.1.ebuild | 29 -
2 files changed, 30 deletions(-)
diff --git a/sci-electronics/xoscope/Manifest b/sci-electronics/xoscope/Manifest
index 1d4cc20517a..b07f4632bea 100644
--- a/sci-electronics/xoscope/Manifest
+++ b/sci-electronics/xoscope/Manifest
@@ -1,3 +1,2 @@
DIST xoscope-2.0.tgz 334875 BLAKE2B
67d3058e822ee4d2a410f92be4ec397381d66150be636bcb799eb13f20326aff0075ab5e1067d2f72a9fe30eda3584228f3ea637aa649554c6f43261a24717e7
SHA512
8a7506dd40133c1bfaf101102f84a5d81712b4cc28d75002f14d5c5b2e08162813dfb68a3e15e1056545d225d563c66ac8a5a81deede3c93a5bb943b81c8fc70
-DIST xoscope-2.1.tar.gz 302170 BLAKE2B
afd706d51fe2b63f5e948d9dafd56a16eb9368717536514f1e734909a758e585893101b0dd381ff3d45da958212f35ea76b44f4689d3242cc731cb7371913d03
SHA512
2ecc75d04d36634d83b7c6636dc7e45fb068ae37e0ee1b0e97c65f9cd56f7fe0e511828821fa0ca2cfe4c6cd6a05e8d23275ec96253dc6faec91db4cbdecd13d
DIST xoscope-2.2.tar.gz 307319 BLAKE2B
860fe234e5958a005ff0cff5143fcc0711d69b958e2f6277589d08074001872b065ecb435493285231ff0c61aea1b50b221aa36127b25947184e059e951a70ec
SHA512
77a1d7d673af3d82e5a3d563d6901c3d6f5a16a1d889e9b95ac2d7d10c8036461a94fb841266b6d131e96303d4fce47b4bc8255b3855690e9148ead6c38b74cd
diff --git a/sci-electronics/xoscope/xoscope-2.1.ebuild
b/sci-electronics/xoscope/xoscope-2.1.ebuild
deleted file mode 100644
index 5b730bc12bc..000
--- a/sci-electronics/xoscope/xoscope-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils linux-info
-
-DESCRIPTION="Soundcard Oscilloscope for X"
-HOMEPAGE="http://xoscope.sourceforge.net;
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtkdatabox
- virtual/man"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~!SND_PCM_OSS"
-ERROR_SND_PCM_OSS="CONFIG_SND_PCM_OSS is needed to support sound card input
via /dev/dsp"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-man_no_-Tutf8.patch
-
- eautoreconf
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/usbip/
commit: f62465507f9cd0eb8529a52993f56253082b4f76
Author: David Seifert gentoo org>
AuthorDate: Sat Nov 28 23:09:00 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6246550
net-misc/usbip: Remove old
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: David Seifert gentoo.org>
net-misc/usbip/Manifest | 1 -
net-misc/usbip/usbip-3.19.ebuild | 52
2 files changed, 53 deletions(-)
diff --git a/net-misc/usbip/Manifest b/net-misc/usbip/Manifest
index 97320827018..a25d0457052 100644
--- a/net-misc/usbip/Manifest
+++ b/net-misc/usbip/Manifest
@@ -1,2 +1 @@
-DIST linux-3.19.tar.xz 81688872 BLAKE2B
0b89e34e62d6fe42f43144fe4f3070df2d9a23831b231918946c1f19a1a4b881095892635983ac7afad902f366b0c6001e46751ed2c96890ecbe9d4056154be6
SHA512
d77bfd9b1cd524ac50bb5a93808955be2f9bcd2ec0badcc8aa6a63401e212f891fd14bd27c6441174ba5d70ab875b9e76c7ebc95f046e31aff1d40790d30351c
DIST linux-4.13.tar.xz 100579888 BLAKE2B
2f8be07d403071b097b019c43fa332bc7d4805dee633a6fdffe5a99d5475015ca9e4881e7f4cbfd36f8c451bacf423436364ea3d9f25b8723a29a178dededb2b
SHA512
a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
diff --git a/net-misc/usbip/usbip-3.19.ebuild b/net-misc/usbip/usbip-3.19.ebuild
deleted file mode 100644
index dd1e0ccb381..000
--- a/net-misc/usbip/usbip-3.19.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ETYPE="sources"
-K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
-
-DESCRIPTION="Userspace utilities for a general USB device sharing system over
IP networks"
-HOMEPAGE="https://www.kernel.org/;
-SRC_URI="${KERNEL_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
-
-RDEPEND=">=dev-libs/glib-2.6
- sys-apps/hwids
- >=sys-kernel/linux-headers-3.17
- virtual/libudev
- tcpd? ( sys-apps/tcp-wrappers )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-DOCS="AUTHORS README ../../../drivers/usb/usbip/usbip_protocol.txt"
-
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
-
-src_prepare() {
- # remove -Werror from build, bug #545398
- sed -i 's/-Werror[^ ]* //g' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use tcpd || echo --without-tcp-wrappers) \
- --with-usbids-dir=/usr/share/misc
-}
-
-src_install() {
- default
- prune_libtool_files
-}
-
-pkg_postinst() {
- elog "For using USB/IP you need to enable USBIP_VHCI_HCD in the client"
- elog "machine's kernel config and USBIP_HOST on the server."
-}
[gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/
commit: 2b8e5c1029efa149b3b9b6ee4796a04931f3ab27
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:06 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8e5c10
net-proxy/ziproxy: port to EAPI 7 and GLEP 81
Closes: https://bugs.gentoo.org/707626
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../ziproxy/files/ziproxy-3.3.1-fno-common.patch | 19 +++
...iproxy-3.3.1-r1.ebuild => ziproxy-3.3.1-r2.ebuild} | 19 +--
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
new file mode 100644
index 000..5b6735c5d88
--- /dev/null
+++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-fno-common.patch
@@ -0,0 +1,19 @@
+--- a/src/tosmarking.c 2020-05-21 14:56:31.09500 +0900
b/src/tosmarking.c 2020-05-21 14:58:11.72000 +0900
+@@ -36,11 +36,11 @@
+ /* private, local. those are not the same as the vars with the same name */
+ int tosmarking_enabled;
+ SOCKET sock_child_out;
+-int TOSFlagsDefault;
+-int TOSFlagsDiff;
+-const t_ut_urltable *tos_markasdiff_url;
+-const t_ct_cttable *tos_maskasdiff_ct;
+-ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
++extern int TOSFlagsDefault;
++extern int TOSFlagsDiff;
++extern const t_ut_urltable *tos_markasdiff_url;
++extern const t_ct_cttable *tos_maskasdiff_ct;
++extern ZP_DATASIZE_TYPE TOSMarkAsDiffSizeBT;
+
+ int current_tos;
+ ZP_DATASIZE_TYPE tos_bytecount;/* counter used by TOSMarkAsDiffSizeBT
*/
diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
similarity index 86%
rename from net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
rename to net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
index b5d92bd3fad..ee73d8bdc66 100644
--- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild
+++ b/net-proxy/ziproxy/ziproxy-3.3.1-r2.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit user
+EAPI=7
DESCRIPTION="A forwarding, non-caching, compressing web proxy server"
HOMEPAGE="http://ziproxy.sourceforge.net/;
@@ -14,6 +13,8 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="sasl xinetd"
RDEPEND="
+ acct-group/ziproxy
+ acct-user/ziproxy
media-libs/giflib:0=
media-libs/libpng:0=
virtual/jpeg:0
@@ -23,12 +24,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-giflib5.patch )
-
-pkg_setup() {
- enewgroup ziproxy
- enewuser ziproxy -1 -1 -1 ziproxy
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-giflib5.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
src_prepare() {
default
@@ -58,7 +57,7 @@ src_install() {
default
dodir /usr/sbin
- mv -vf "${D}"usr/{,s}bin/ziproxy || die
+ mv -vf "${ED}"/usr/{,s}bin/ziproxy || die
dobin src/tools/ziproxy_genhtml_stats.sh
[gentoo-commits] repo/gentoo:master commit in: dev-scheme/sigscheme/, dev-scheme/sigscheme/files/
commit: 5cd5bc929649189c6210696825db557956f9d11e
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:51 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd5bc92
dev-scheme/sigscheme: port to EAPI 7
* Thanks to Jeroen Roovers for submitting the patch
Closes: https://bugs.gentoo.org/706906
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../sigscheme/files/sigscheme-0.8.5-fno-common.patch | 11 +++
dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild | 14 ++
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
b/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
new file mode 100644
index 000..efac2648a28
--- /dev/null
+++ b/dev-scheme/sigscheme/files/sigscheme-0.8.5-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/libgcroots/include/private/gc_priv.h
b/libgcroots/include/private/gc_priv.h
+@@ -1979,7 +1979,7 @@
+ /* the signal mask. */
+ # define SETJMP(env) sigsetjmp(env, 1)
+ # define LONGJMP(env, val) siglongjmp(env, val)
+-# define JMP_BUF sigjmp_buf
++# define JMP_BUF extern sigjmp_buf
+ #else
+ # ifdef ECOS
+ # define SETJMP(env) hal_setjmp(env)
diff --git a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
index cbed33d141c..a154c41664d 100644
--- a/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
+++ b/dev-scheme/sigscheme/sigscheme-0.8.5-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
HOMEPAGE="https://code.google.com/p/sigscheme/;
@@ -10,8 +10,14 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2;
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_configure() {
- econf --enable-hygienic-macro
+ econf --enable-hygienic-macro --disable-static
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
}
[gentoo-commits] repo/gentoo:master commit in: net-misc/usbip/, net-misc/usbip/files/
commit: 312fbb322f44b3023a33e93f7c5a2eda32636a5c
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:57 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=312fbb32
net-misc/usbip: fix build with gcc-10
* Unconditionally disable static-libs
* Thanks to Jeroen Roovers for submitting the patch
Closes: https://bugs.gentoo.org/707222
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
net-misc/usbip/files/usbip-4.13-fno-common.patch | 44 ++
.../{usbip-4.13.ebuild => usbip-4.13-r1.ebuild}| 22 +--
2 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/net-misc/usbip/files/usbip-4.13-fno-common.patch
b/net-misc/usbip/files/usbip-4.13-fno-common.patch
new file mode 100644
index 000..b8ffc40c4b9
--- /dev/null
+++ b/net-misc/usbip/files/usbip-4.13-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/libsrc/usbip_common.c
b/libsrc/usbip_common.c
+@@ -14,7 +14,7 @@
+ int usbip_use_stderr;
+ int usbip_use_debug;
+
+-extern struct udev *udev_context;
++struct udev *udev_context;
+
+ struct speed_string {
+ int num;
+--- alibsrc/usbip_common.h
b/libsrc/usbip_common.h
+@@ -53,6 +53,8 @@
+ #define ST_NODEV 0x04
+ #define ST_ERROR 0x05
+
++extern struct udev *udev_context;
++
+ extern int usbip_use_syslog;
+ extern int usbip_use_stderr;
+ extern int usbip_use_debug ;
+--- a/libsrc/usbip_host_common.c
b/libsrc/usbip_host_common.c
+@@ -23,8 +23,6 @@
+ #include "list.h"
+ #include "sysfs_utils.h"
+
+-struct udev *udev_context;
+-
+ static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)
+ {
+ char status_attr_path[SYSFS_PATH_MAX];
+--- a/libsrc/vhci_driver.c
b/libsrc/vhci_driver.c
+@@ -15,7 +15,6 @@
+ #define PROGNAME "libusbip"
+
+ struct usbip_vhci_driver *vhci_driver;
+-struct udev *udev_context;
+
+ static struct usbip_imported_device *
+ imported_device_init(struct usbip_imported_device *idev, char *busid)
+
diff --git a/net-misc/usbip/usbip-4.13.ebuild
b/net-misc/usbip/usbip-4.13-r1.ebuild
similarity index 77%
rename from net-misc/usbip/usbip-4.13.ebuild
rename to net-misc/usbip/usbip-4.13-r1.ebuild
index bfb8473198b..453bd87fa8f 100644
--- a/net-misc/usbip/usbip-4.13.ebuild
+++ b/net-misc/usbip/usbip-4.13-r1.ebuild
@@ -2,9 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
ETYPE="sources"
K_NOUSENAME=1
-inherit autotools eutils kernel-2 ltprune
+inherit autotools kernel-2
DESCRIPTION="Userspace utilities for a general USB device sharing system over
IP networks"
HOMEPAGE="https://www.kernel.org/;
@@ -13,10 +14,10 @@ SRC_URI="${KERNEL_URI}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="static-libs tcpd"
-RESTRICT=""
+IUSE="tcpd"
-RDEPEND=">=dev-libs/glib-2.6
+RDEPEND="
+ >=dev-libs/glib-2.6
sys-apps/hwids
>=sys-kernel/linux-headers-3.17
virtual/libudev
@@ -24,33 +25,32 @@ RDEPEND=">=dev-libs/glib-2.6
DEPEND="${RDEPEND}
virtual/pkgconfig"
-DOCS="AUTHORS README"
+S="${WORKDIR}/linux-${PV}/tools/usb/${PN}"
-S=${WORKDIR}/linux-${PV}/tools/usb/${PN}
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_unpack() {
tar xJf "${DISTDIR}"/${A} linux-${PV}/tools/usb/${PN} || die
}
src_prepare() {
+ default
# remove -Werror from build, bug #545398
sed -i 's/-Werror[^ ]* //g' configure.ac || die
- default
-
eautoreconf
}
src_configure() {
econf \
- $(use_enable static-libs static) \
+ --disable-static \
$(use tcpd || echo --without-tcp-wrappers) \
- --with-usbids-dir=/usr/share/misc
+ --with-usbids-dir="${EPREFIX}"/usr/share/misc
}
src_install() {
default
- prune_libtool_files
+ find "${ED}" -name '*.la' -delete || die
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: net-print/c2esp/, net-print/c2esp/files/
commit: b2c34e86772c33a88fb514cd82d1f3c56969c91c
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:09:03 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:09:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2c34e86
net-print/c2esp: fix build with gcc-10
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/708236
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
net-print/c2esp/c2esp-27.ebuild| 6 ++--
net-print/c2esp/files/c2esp-27-fno-common.patch| 32 ++
...ludes.patch => c2esp-27-missing-includes.patch} | 0
3 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/net-print/c2esp/c2esp-27.ebuild b/net-print/c2esp/c2esp-27.ebuild
index 69e58fbb92f..f7fe2a2c6a3 100644
--- a/net-print/c2esp/c2esp-27.ebuild
+++ b/net-print/c2esp/c2esp-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,6 +6,7 @@ EAPI=7
DESCRIPTION="A CUPS filter for Kodak ESP printers"
HOMEPAGE="https://sourceforge.net/projects/cupsdriverkodak;
SRC_URI="mirror://sourceforge/cupsdriverkodak/files/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
@@ -17,7 +18,8 @@ DEPEND=">=media-libs/jbigkit-2.0-r1:=
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/0001-Fix-various-missing-includes.patch
+ "${FILESDIR}"/${P}-missing-includes.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_configure() {
diff --git a/net-print/c2esp/files/c2esp-27-fno-common.patch
b/net-print/c2esp/files/c2esp-27-fno-common.patch
new file mode 100644
index 000..8e4dc81519e
--- /dev/null
+++ b/net-print/c2esp/files/c2esp-27-fno-common.patch
@@ -0,0 +1,32 @@
+Taken from:
https://sources.debian.org/patches/c2esp/27-8/0002-Add-extern-stanzas-to-variable-definitions-in-header.patch/
+Author: Didier Raboud
+
+--- a/src/c2espcommon.c
b/src/c2espcommon.c
+@@ -42,11 +42,11 @@
+ * Globals...
+ */
+ char CallerName[50]; /* String that identifies the calling
program */
+-int DoBack; /* Enables the back channel comms */
++extern intDoBack; /* Enables the back channel comms */
+ char BackBuf[32000]; //for the back channel replies from the printer
+ int BackBufLen=sizeof(BackBuf)-1;
+ FILE *LogFile = NULL; //file descriptor for log file
+-time_tStartTime;
++extern time_t StartTime;
+ int BlackPercent, ColourPercent;
+
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile)
+--- a/src/c2espcommon.h
b/src/c2espcommon.h
+@@ -35,8 +35,8 @@
+ /*
+ * Globals...
+ */
+-char BackBuf[32000]; //for the back channel replies from the printer
+-int ColourPercent, BlackPercent; //to store the detected marker
levels
++extern char BackBuf[32000]; //for the back channel replies from the printer
++extern int ColourPercent, BlackPercent; //to store the detected marker levels
+
+
+ time_t KeepAwake(time_t Start, int Interval, FILE *PrintFile);
diff --git a/net-print/c2esp/files/0001-Fix-various-missing-includes.patch
b/net-print/c2esp/files/c2esp-27-missing-includes.patch
similarity index 100%
rename from net-print/c2esp/files/0001-Fix-various-missing-includes.patch
rename to net-print/c2esp/files/c2esp-27-missing-includes.patch
[gentoo-commits] repo/gentoo:master commit in: acct-group/sniproxy/
commit: 3fce5a956155a5e9506816eba669aa4c367b0bf8 Author: Jakov Smolic sartura hr> AuthorDate: Sat Nov 28 23:08:31 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Nov 28 23:08:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fce5a95 acct-group/sniproxy: Add new group for sniproxy Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> acct-group/sniproxy/metadata.xml | 12 acct-group/sniproxy/sniproxy-0.ebuild | 8 2 files changed, 20 insertions(+) diff --git a/acct-group/sniproxy/metadata.xml b/acct-group/sniproxy/metadata.xml new file mode 100644 index 000..89aeeb96e86 --- /dev/null +++ b/acct-group/sniproxy/metadata.xml @@ -0,0 +1,12 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + nemuna...@nemunai.re + Pierre-Olivier Mercier + + + proxy-ma...@gentoo.org + Proxy Maintainers + + diff --git a/acct-group/sniproxy/sniproxy-0.ebuild b/acct-group/sniproxy/sniproxy-0.ebuild new file mode 100644 index 000..526eb45957e --- /dev/null +++ b/acct-group/sniproxy/sniproxy-0.ebuild @@ -0,0 +1,8 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=366
[gentoo-commits] repo/gentoo:master commit in: acct-user/ziproxy/
commit: 3b22e93bdd3ad912616472473afbb7d726970cb9
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:40 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b22e93b
acct-user/ziproxy: Add user for ziproxy
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
acct-user/ziproxy/metadata.xml | 5 +
acct-user/ziproxy/ziproxy-0.ebuild | 11 +++
2 files changed, 16 insertions(+)
diff --git a/acct-user/ziproxy/metadata.xml b/acct-user/ziproxy/metadata.xml
new file mode 100644
index 000..7a38bb90096
--- /dev/null
+++ b/acct-user/ziproxy/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+
diff --git a/acct-user/ziproxy/ziproxy-0.ebuild
b/acct-user/ziproxy/ziproxy-0.ebuild
new file mode 100644
index 000..ea999861d75
--- /dev/null
+++ b/acct-user/ziproxy/ziproxy-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=367
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
[gentoo-commits] repo/gentoo:master commit in: app-doc/halibut/, app-doc/halibut/files/
commit: de2c720021b8aad37dd392a1a395fb47cf474bb9
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:43 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2c7200
app-doc/halibut: fix build with gcc-10
* Thanks to lekto o2.pl for submitting the patch
Closes: https://bugs.gentoo.org/707020
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
app-doc/halibut/files/halibut-1.2-fno-common.patch | 22 ++
app-doc/halibut/halibut-1.2.ebuild | 5 +++--
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/app-doc/halibut/files/halibut-1.2-fno-common.patch
b/app-doc/halibut/files/halibut-1.2-fno-common.patch
new file mode 100644
index 000..e547e304d9c
--- /dev/null
+++ b/app-doc/halibut/files/halibut-1.2-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/bk_paper.c
b/bk_paper.c
+@@ -75,6 +75,8 @@
+ #include "halibut.h"
+ #include "paper.h"
+
++font_info *all_fonts;
++
+ typedef struct paper_conf_Tag paper_conf;
+ typedef struct paper_idx_Tag paper_idx;
+
+--- a/paper.h
b/paper.h
+@@ -78,7 +78,7 @@ struct ligature_Tag {
+ * metrics are read in.
+ */
+
+-font_info *all_fonts;
++extern font_info *all_fonts;
+
+ struct font_info_Tag {
+ font_info *next;
diff --git a/app-doc/halibut/halibut-1.2.ebuild
b/app-doc/halibut/halibut-1.2.ebuild
index 13c64206e3f..933b648f2be 100644
--- a/app-doc/halibut/halibut-1.2.ebuild
+++ b/app-doc/halibut/halibut-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -12,7 +12,8 @@
SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz;
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
src_compile() {
tc-export CC
[gentoo-commits] repo/gentoo:master commit in: media-tv/w_scan/files/, media-tv/w_scan/
commit: c06f102948f0b9c21f8870d2a1361e018d80ac77
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:54 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06f1029
media-tv/w_scan: port to EAPI 7
* Thanks to Sam James for providing the patch link
Closes: https://bugs.gentoo.org/707718
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../w_scan/files/w_scan-20170107-fno-common.patch | 24 ++
media-tv/w_scan/w_scan-20170107.ebuild | 11 +-
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
new file mode 100644
index 000..43bd7144eeb
--- /dev/null
+++ b/media-tv/w_scan/files/w_scan-20170107-fno-common.patch
@@ -0,0 +1,24 @@
+Taken from:
https://git.buildroot.net/buildroot/tree/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch?id=2e8bf36dc4421f2213f8fa6de91b2c9bf3d64e45
+Author: Fabrice Fontaine
+
+--- w_scan-20170107.orig/si_types.h2020-09-20 11:09:56.776963441 +0200
w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200
+@@ -114,7 +114,7 @@
+ uint32_t logical_channel_number;
+ uint8_t running;
+ void * priv;
+-} service_t, * p_service_t;
++};
+
+
/***
+ /* transponder type.
+@@ -201,7 +201,7 @@
+ /**/
+ char * network_name;
+ network_change_t network_change;
+-} __attribute__((packed)) transponder_t, * p_transponder_t;
++} __attribute__((packed));
+
+
/***
+ /* satellite channel routing type.
+
diff --git a/media-tv/w_scan/w_scan-20170107.ebuild
b/media-tv/w_scan/w_scan-20170107.ebuild
index 0b7e605bf66..926e92f2c2c 100644
--- a/media-tv/w_scan/w_scan-20170107.ebuild
+++ b/media-tv/w_scan/w_scan-20170107.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
DESCRIPTION="Scan DVB-C/DVB-T/DVB-S channels"
HOMEPAGE="http://wirbel.htpc-forum.de/w_scan/index2.html;
@@ -13,12 +13,11 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc examples"
DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
-RDEPEND=""
-src_install() {
- emake DESTDIR="${D}" install
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
- dodoc ChangeLog README
+src_install() {
+ default
if use doc; then
dodoc doc/README.file_formats doc/README_VLC_DVB
[gentoo-commits] repo/gentoo:master commit in: acct-group/ziproxy/
commit: b0b4839ed87eaab04958f89d14424391c94bb463 Author: Jakov Smolic sartura hr> AuthorDate: Sat Nov 28 23:08:34 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Nov 28 23:08:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b4839e acct-group/ziproxy: Add group for ziproxy Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> acct-group/ziproxy/metadata.xml | 5 + acct-group/ziproxy/ziproxy-0.ebuild | 8 2 files changed, 13 insertions(+) diff --git a/acct-group/ziproxy/metadata.xml b/acct-group/ziproxy/metadata.xml new file mode 100644 index 000..7a38bb90096 --- /dev/null +++ b/acct-group/ziproxy/metadata.xml @@ -0,0 +1,5 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + diff --git a/acct-group/ziproxy/ziproxy-0.ebuild b/acct-group/ziproxy/ziproxy-0.ebuild new file mode 100644 index 000..2a615442577 --- /dev/null +++ b/acct-group/ziproxy/ziproxy-0.ebuild @@ -0,0 +1,8 @@ +# Copyright 2019-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit acct-group + +ACCT_GROUP_ID=367
[gentoo-commits] repo/gentoo:master commit in: acct-user/sniproxy/
commit: 4461e501dbd680a76521336bad1366d0c6c0cde5
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Nov 28 23:08:37 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sat Nov 28 23:08:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4461e501
acct-user/sniproxy: Add user for sniproxy
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
acct-user/sniproxy/metadata.xml | 12
acct-user/sniproxy/sniproxy-0.ebuild | 11 +++
2 files changed, 23 insertions(+)
diff --git a/acct-user/sniproxy/metadata.xml b/acct-user/sniproxy/metadata.xml
new file mode 100644
index 000..89aeeb96e86
--- /dev/null
+++ b/acct-user/sniproxy/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ nemuna...@nemunai.re
+ Pierre-Olivier Mercier
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/acct-user/sniproxy/sniproxy-0.ebuild
b/acct-user/sniproxy/sniproxy-0.ebuild
new file mode 100644
index 000..d7566da9196
--- /dev/null
+++ b/acct-user/sniproxy/sniproxy-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+ACCT_USER_ID=366
+ACCT_USER_GROUPS=( "${PN}" )
+
+acct-user_add_deps
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, policy/modules/admin/, policy/modules/system/
commit: 33cfbfdf7674a98aeb8c94d67fc03b170fcc9d6a Author: Chris PeBenito ieee org> AuthorDate: Sun Nov 22 19:03:11 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:56:17 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=33cfbfdf various: Module version bump. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/admin/portage.te | 2 +- policy/modules/services/xserver.te | 2 +- policy/modules/system/getty.te | 2 +- policy/modules/system/init.te | 2 +- policy/modules/system/miscfiles.te | 2 +- policy/modules/system/systemd.te| 2 +- policy/modules/system/userdomain.te | 2 +- policy/modules/system/xdg.te| 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/policy/modules/admin/portage.te b/policy/modules/admin/portage.te index b6d01ea3..c0d6cace 100644 --- a/policy/modules/admin/portage.te +++ b/policy/modules/admin/portage.te @@ -1,4 +1,4 @@ -policy_module(portage, 1.19.0) +policy_module(portage, 1.19.1) # diff --git a/policy/modules/services/xserver.te b/policy/modules/services/xserver.te index 69992107..f1dcad7d 100644 --- a/policy/modules/services/xserver.te +++ b/policy/modules/services/xserver.te @@ -1,4 +1,4 @@ -policy_module(xserver, 3.20.1) +policy_module(xserver, 3.20.2) gen_require(` class x_drawable all_x_drawable_perms; diff --git a/policy/modules/system/getty.te b/policy/modules/system/getty.te index f9514c77..ffcee469 100644 --- a/policy/modules/system/getty.te +++ b/policy/modules/system/getty.te @@ -1,4 +1,4 @@ -policy_module(getty, 1.14.0) +policy_module(getty, 1.14.1) # diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te index 6b2654fa..9f9b78b0 100644 --- a/policy/modules/system/init.te +++ b/policy/modules/system/init.te @@ -1,4 +1,4 @@ -policy_module(init, 2.9.2) +policy_module(init, 2.9.3) gen_require(` class passwd rootok; diff --git a/policy/modules/system/miscfiles.te b/policy/modules/system/miscfiles.te index 436f58e2..6cede382 100644 --- a/policy/modules/system/miscfiles.te +++ b/policy/modules/system/miscfiles.te @@ -1,4 +1,4 @@ -policy_module(miscfiles, 1.18.0) +policy_module(miscfiles, 1.18.1) # diff --git a/policy/modules/system/systemd.te b/policy/modules/system/systemd.te index a08b83d5..b6e508eb 100644 --- a/policy/modules/system/systemd.te +++ b/policy/modules/system/systemd.te @@ -1,4 +1,4 @@ -policy_module(systemd, 1.10.4) +policy_module(systemd, 1.10.5) # # diff --git a/policy/modules/system/userdomain.te b/policy/modules/system/userdomain.te index fb456127..91af760b 100644 --- a/policy/modules/system/userdomain.te +++ b/policy/modules/system/userdomain.te @@ -1,4 +1,4 @@ -policy_module(userdomain, 4.20.2) +policy_module(userdomain, 4.20.3) # diff --git a/policy/modules/system/xdg.te b/policy/modules/system/xdg.te index d0c08975..af4efc3c 100644 --- a/policy/modules/system/xdg.te +++ b/policy/modules/system/xdg.te @@ -1,4 +1,4 @@ -policy_module(xdg, 1.1.0) +policy_module(xdg, 1.1.1) #
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: 850672bdf4d432537c4a064319d1c1da05f67af6 Author: Jonathan Davies protonmail com> AuthorDate: Tue Nov 17 03:46:25 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:56:08 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=850672bd init: Added fcontext for openrc-shutdown. Signed-off-by: Jonathan Davies protonmail.com> Signed-off-by: Jason Zaman perfinion.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/init.fc | 1 + 1 file changed, 1 insertion(+) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index acf89af4..74fb8211 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -47,6 +47,7 @@ ifdef(`distro_gentoo', ` /usr/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) /usr/sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) /usr/sbin/openrc-init -- gen_context(system_u:object_r:init_exec_t,s0) +/usr/sbin/openrc-shutdown -- gen_context(system_u:object_r:init_exec_t,s0) ') ifdef(`distro_redhat',`
[gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/
commit: b5ac499c52ff081dd3bc394c9f9713b8a4c3964f Author: Jason Zaman gentoo org> AuthorDate: Sat Nov 28 23:00:45 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 23:00:45 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b5ac499c Merge upstream Signed-off-by: Jason Zaman gentoo.org> gentoo/STATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gentoo/STATE b/gentoo/STATE index ddc7f641..91b14bfd 100644 --- a/gentoo/STATE +++ b/gentoo/STATE @@ -1 +1 @@ -main f1b83f8ef4a1fc93047df634175873a361558af7 +main fe29a74cade96fc98d5101fcc467bf346ff8a32e
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: 46171c7e1b366ee26f62fcbceab9ea3c9f532628 Author: Jason Zaman perfinion com> AuthorDate: Tue Nov 17 03:46:27 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:56:12 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=46171c7e init: upstream fcontexts from gentoo policy Signed-off-by: Jason Zaman perfinion.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/init.fc | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index 74fb8211..c8451701 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -44,8 +44,11 @@ ifdef(`distro_gentoo',` /usr/sbin/upstart -- gen_context(system_u:object_r:init_exec_t,s0) ifdef(`distro_gentoo', ` +/usr/lib/rc/cache(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/usr/lib/rc/console(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) /usr/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) -/usr/sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) +/usr/sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) +/usr/sbin/openrc -- gen_context(system_u:object_r:rc_exec_t,s0) /usr/sbin/openrc-init -- gen_context(system_u:object_r:init_exec_t,s0) /usr/sbin/openrc-shutdown -- gen_context(system_u:object_r:init_exec_t,s0) ') @@ -79,6 +82,9 @@ ifdef(`distro_debian',` ifdef(`distro_gentoo', ` /var/lib/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) +/var/lib/ip6?tables(/.*)? gen_context(system_u:object_r:initrc_tmp_t,s0) + +/run/openrc(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) /run/svscan\.pid -- gen_context(system_u:object_r:initrc_runtime_t,s0) ')
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: ef51b2e319e62e59306a8b44ed96d98e0de0dec4 Author: Jonathan Davies protonmail com> AuthorDate: Tue Nov 17 03:46:24 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:56:01 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ef51b2e3 init: Added fcontext for openrc-init. Signed-off-by: Jonathan Davies protonmail.com> Signed-off-by: Jason Zaman perfinion.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/init.fc | 1 + 1 file changed, 1 insertion(+) diff --git a/policy/modules/system/init.fc b/policy/modules/system/init.fc index eeeb32be..acf89af4 100644 --- a/policy/modules/system/init.fc +++ b/policy/modules/system/init.fc @@ -46,6 +46,7 @@ ifdef(`distro_gentoo',` ifdef(`distro_gentoo', ` /usr/lib/rc/init\.d(/.*)? gen_context(system_u:object_r:initrc_state_t,s0) /usr/sbin/rc -- gen_context(system_u:object_r:rc_exec_t,s0) +/usr/sbin/openrc-init -- gen_context(system_u:object_r:init_exec_t,s0) ') ifdef(`distro_redhat',`
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: 50ce02c8052e06fca2e8ec5ba6982effdf522d67 Author: Jason Zaman gentoo org> AuthorDate: Tue Nov 17 03:46:28 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:56:14 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=50ce02c8 systemd: make remaining dbus_* optional Almost all calls to dbus_ interfaces were already optional, this makes the remaining one optional_policy so that the modules can be installed / upgraded easier. Signed-off-by: Jason Zaman perfinion.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/systemd.te | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/policy/modules/system/systemd.te b/policy/modules/system/systemd.te index 74f3fc55..a08b83d5 100644 --- a/policy/modules/system/systemd.te +++ b/policy/modules/system/systemd.te @@ -1450,4 +1450,6 @@ userdom_manage_user_runtime_dirs(systemd_user_runtime_dir_t) userdom_mounton_user_runtime_dirs(systemd_user_runtime_dir_t) userdom_relabelto_user_runtime_dirs(systemd_user_runtime_dir_t) -dbus_system_bus_client(systemd_user_runtime_dir_t) +optional_policy(` +dbus_system_bus_client(systemd_user_runtime_dir_t) +')
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: 47d0b1e01912604be4f030997d4946439e80b1ce Author: Jason Zaman gentoo org> AuthorDate: Tue Nov 17 03:46:26 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:56:10 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=47d0b1e0 Add transition on gentoo init_t to openrc Commit "init: replace call to init_domtrans_script" (be231899f5c7f0882843942624dd268f99bab141 in upstream repo) removed the call to init_domtrans_script which removed the openrc domtrans. This adds it back directly in the distro_gentoo block. Signed-off-by: Jason Zaman perfinion.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/init.te | 1 + 1 file changed, 1 insertion(+) diff --git a/policy/modules/system/init.te b/policy/modules/system/init.te index b52eaddb..6b2654fa 100644 --- a/policy/modules/system/init.te +++ b/policy/modules/system/init.te @@ -120,6 +120,7 @@ init_unit_file(systemd_unit_t) ifdef(`distro_gentoo',` type rc_exec_t; domain_entry_file(initrc_t, rc_exec_t) + domtrans_pattern(init_t, rc_exec_t, initrc_t) ') ifdef(`enable_mls',`
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/, policy/modules/system/
commit: e2236d7e0c64a40ec71ab835f5818e396437ec2e
Author: Jason Zaman gentoo org>
AuthorDate: Tue Nov 17 03:46:21 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Sat Nov 28 22:55:48 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=e2236d7e
userdomain: Add watch on home dirs
avc: denied { watch } for pid=12351 comm="gmain"
path="/usr/share/backgrounds/xfce" dev="zfs" ino=366749
scontext=staff_u:staff_r:staff_t:s0-s0:c0.c1023
tcontext=system_u:object_r:usr_t:s0 tclass=dir permissive=0
avc: denied { watch } for pid=11646 comm="gmain" path="/etc/fonts" dev="zfs"
ino=237700 scontext=staff_u:staff_r:staff_t:s0-s0:c0.c1023
tcontext=system_u:object_r:fonts_t:s0 tclass=dir permissive=0
avc: denied { watch } for pid=12351 comm="gmain" path="/home/jason/Desktop"
dev="zfs" ino=33153 scontext=staff_u:staff_r:staff_t:s0-s0:c0.c1023
tcontext=staff_u:object_r:user_home_t:s0 tclass=dir permissive=0
avc: denied { watch } for pid=12574 comm="gmain"
path="/home/jason/.local/share/icc" dev="zfs" ino=1954514
scontext=staff_u:staff_r:staff_t:s0-s0:c0.c1023
tcontext=staff_u:object_r:xdg_data_t:s0 tclass=dir permissive=0
avc: denied { watch } for pid=11795 comm="gmain"
path="/home/jason/.config/xfce4/panel/launcher-19" dev="zfs" ino=35464
scontext=staff_u:staff_r:staff_t:s0-s0:c0.c1023
tcontext=staff_u:object_r:xdg_config_t:s0 tclass=dir permissive=0
avc: denied { watch } for pid=12351 comm="gmain"
path="/home/jason/downloads/pics" dev="zfs" ino=38173
scontext=staff_u:staff_r:staff_t:s0-s0:c0.c1023
tcontext=staff_u:object_r:xdg_downloads_t:s0 tclass=dir permissive=0
Signed-off-by: Jason Zaman perfinion.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/modules/services/xserver.if | 11 +-
policy/modules/system/miscfiles.if | 18
policy/modules/system/userdomain.if | 15 ++-
policy/modules/system/xdg.if| 198
4 files changed, 240 insertions(+), 2 deletions(-)
diff --git a/policy/modules/services/xserver.if
b/policy/modules/services/xserver.if
index baa39ef8..d5d6c791 100644
--- a/policy/modules/services/xserver.if
+++ b/policy/modules/services/xserver.if
@@ -95,6 +95,7 @@ interface(`xserver_restricted_role',`
dev_rw_usbfs($2)
miscfiles_read_fonts($2)
+ miscfiles_watch_fonts_dirs($2)
xserver_common_x_domain_template(user, $2) #selint-disable:S-004
xserver_domtrans($2)
@@ -186,10 +187,13 @@ interface(`xserver_role',`
optional_policy(`
xdg_manage_all_cache($2)
xdg_relabel_all_cache($2)
+ xdg_watch_all_cache_dirs($2)
xdg_manage_all_config($2)
xdg_relabel_all_config($2)
+ xdg_watch_all_config_dirs($2)
xdg_manage_all_data($2)
xdg_relabel_all_data($2)
+ xdg_watch_all_data_dirs($2)
xdg_generic_user_home_dir_filetrans_cache($2, dir, ".cache")
xdg_generic_user_home_dir_filetrans_config($2, dir, ".config")
@@ -203,14 +207,19 @@ interface(`xserver_role',`
xdg_manage_documents($2)
xdg_relabel_documents($2)
+ xdg_watch_documents_dirs($2)
xdg_manage_downloads($2)
xdg_relabel_downloads($2)
+ xdg_watch_downloads_dirs($2)
xdg_manage_music($2)
xdg_relabel_music($2)
+ xdg_watch_music_dirs($2)
xdg_manage_pictures($2)
xdg_relabel_pictures($2)
+ xdg_watch_pictures_dirs($2)
xdg_manage_videos($2)
xdg_relabel_videos($2)
+ xdg_watch_videos_dirs($2)
xdg_cache_filetrans($2, mesa_shader_cache_t, dir,
"mesa_shader_cache")
')
@@ -508,7 +517,7 @@ interface(`xserver_use_user_fonts',`
')
# Read per user fonts
- allow $1 user_fonts_t:dir list_dir_perms;
+ allow $1 user_fonts_t:dir { list_dir_perms watch };
allow $1 user_fonts_t:file { map read_file_perms };
# Manipulate the global font cache
diff --git a/policy/modules/system/miscfiles.if
b/policy/modules/system/miscfiles.if
index a0b13261..751b3579 100644
--- a/policy/modules/system/miscfiles.if
+++ b/policy/modules/system/miscfiles.if
@@ -854,6 +854,24 @@ interface(`miscfiles_manage_public_files',`
manage_lnk_files_pattern($1, public_content_rw_t, public_content_rw_t)
')
+
+##
+## Watch public files
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`miscfiles_watch_public_dirs',`
+ gen_require(`
+ type public_content_rw_t;
+ ')
+
+ allow $1 public_content_rw_t:dir watch;
+')
+
##
## Read TeX data
diff --git a/policy/modules/system/userdomain.if
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: e42716a61c8fe4fb0317fbc23a9b8054e0ec9608 Author: Chris PeBenito ieee org> AuthorDate: Fri Nov 20 14:54:32 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:55:46 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=e42716a6 dbus: Module version bump. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/services/dbus.te | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy/modules/services/dbus.te b/policy/modules/services/dbus.te index 86e79b76..f4ee2ad3 100644 --- a/policy/modules/services/dbus.te +++ b/policy/modules/services/dbus.te @@ -1,4 +1,4 @@ -policy_module(dbus, 1.29.2) +policy_module(dbus, 1.29.3) gen_require(` class dbus all_dbus_perms;
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/admin/
commit: b0b027157f3d12f12c5f859343ae4c28224c5629 Author: Jonathan Davies protonmail com> AuthorDate: Tue Nov 17 03:46:23 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:55:59 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=b0b02715 portage: Added /var/cache/distfiles path. Closes: https://github.com/perfinion/hardened-refpolicy/pull/1 Signed-off-by: Jason Zaman perfinion.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/admin/portage.fc | 1 + 1 file changed, 1 insertion(+) diff --git a/policy/modules/admin/portage.fc b/policy/modules/admin/portage.fc index 5757deaa..b1b28f3e 100644 --- a/policy/modules/admin/portage.fc +++ b/policy/modules/admin/portage.fc @@ -28,6 +28,7 @@ /var/db/pkg(/.*)? gen_context(system_u:object_r:portage_db_t,s0) /var/db/repos(/.*)?gen_context(system_u:object_r:portage_ebuild_t,s0) /var/cache/binpkgs(/.*)? gen_context(system_u:object_r:portage_ebuild_t,s0) +/var/cache/distfiles(/.*)? gen_context(system_u:object_r:portage_ebuild_t,s0) /var/cache/distfiles/cvs-src(/.*)? gen_context(system_u:object_r:portage_srcrepo_t,s0) /var/cache/distfiles/egit-src(/.*)? gen_context(system_u:object_r:portage_srcrepo_t,s0) /var/cache/distfiles/git[0-9]-src(/.*)? gen_context(system_u:object_r:portage_srcrepo_t,s0)
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: 1958d08d70d801a23e7ef15a8b3b0857b6c79946 Author: Daniel Burgener microsoft com> AuthorDate: Wed Nov 11 21:14:43 2020 + Commit: Jason Zaman gentoo org> CommitDate: Sat Nov 28 22:55:41 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=1958d08d Allow init to mount over the system bus In portable profiles, systemd bind mounts the system bus into process namespaces Signed-off-by: Daniel Burgener microsoft.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/services/dbus.te | 1 + 1 file changed, 1 insertion(+) diff --git a/policy/modules/services/dbus.te b/policy/modules/services/dbus.te index f123c6d9..86e79b76 100644 --- a/policy/modules/services/dbus.te +++ b/policy/modules/services/dbus.te @@ -50,6 +50,7 @@ init_named_socket_activation(system_dbusd_t, system_dbusd_runtime_t) type system_dbusd_runtime_t alias system_dbusd_var_run_t; files_runtime_file(system_dbusd_runtime_t) init_daemon_runtime_file(system_dbusd_runtime_t, dir, "dbus") +init_mountpoint(system_dbusd_runtime_t) type system_dbusd_tmp_t; files_tmp_file(system_dbusd_tmp_t)
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: 63b316f5821e49c3f6b3e87a219af24e2bebab12 Author: Chris PeBenito ieee org> AuthorDate: Mon Nov 9 16:45:32 2020 + Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 16 09:03:43 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=63b316f5 lvm: Module version bump. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/system/lvm.te | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy/modules/system/lvm.te b/policy/modules/system/lvm.te index 58517502..9c281a51 100644 --- a/policy/modules/system/lvm.te +++ b/policy/modules/system/lvm.te @@ -1,4 +1,4 @@ -policy_module(lvm, 1.25.0) +policy_module(lvm, 1.25.1) #
[gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/
commit: 3fcff3ea67938cf4dc21a6f694295b94edbcb79e Author: Jason Zaman gentoo org> AuthorDate: Mon Nov 16 09:04:22 2020 + Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 16 09:04:22 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=3fcff3ea Merge upstream Signed-off-by: Jason Zaman gentoo.org> gentoo/STATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gentoo/STATE b/gentoo/STATE index ecc91a17..ddc7f641 100644 --- a/gentoo/STATE +++ b/gentoo/STATE @@ -1 +1 @@ -master 14a45a594baf987679cbda6302e54ba0617efe48 +main f1b83f8ef4a1fc93047df634175873a361558af7
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/flask/
commit: dadb27bdd553c2e64101dc9992a1df4f6e5975d0
Author: Dannick Pomerleau hotmail com>
AuthorDate: Fri Oct 16 00:49:49 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Nov 16 09:03:43 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=dadb27bd
access_vectors: Add new capabilities to cap2
Updated location of capability definitions to point to current location within
kernel source code.
CAP_BPF and CAP_PERFMON mainlined in: cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2,
original commit: a17b53c4a4b55ec322c132b6670743612229ee9c
CAP_CHECKPOINT_RESTORE mainlined in: 74858abbb103f922487fd1a24513bbed80f9,
original commit: 124ea650d3072b005457faed69909221c2905a1f
The missing capabilities were noticed on archlinux with kernel 5.8.14-arch1-1.
Signed-off-by: Dannick Pomerleau hotmail.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/flask/access_vectors | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/policy/flask/access_vectors b/policy/flask/access_vectors
index a9aceb46..d464a3de 100644
--- a/policy/flask/access_vectors
+++ b/policy/flask/access_vectors
@@ -132,7 +132,7 @@ common x_device
#
common cap
{
- # The capabilities are defined in include/linux/capability.h
+ # The capabilities are defined in include/uapi/linux/capability.h
# Capabilities >= 32 are defined in the cap2 common.
# Care should be taken to ensure that these are consistent with
# those definitions. (Order matters)
@@ -179,6 +179,9 @@ common cap2
wake_alarm
block_suspend
audit_read
+ perfmon
+ bpf
+ checkpoint_restore
}
#
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/, policy/modules/kernel/
commit: de9c38bc9643b4d761a7eff93400c2232d75220c Author: Anthony PERARD citrix com> AuthorDate: Tue Oct 27 17:22:28 2020 + Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 16 09:03:43 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=de9c38bc xen: Allow xenstored to map /proc/xen/xsd_kva xenstored is using mmap() on /proc/xen/xsd_kva, and when the SELinux boolean "domain_can_mmap_files" in CentOS is set to false the mmap() call fails. Signed-off-by: Anthony PERARD citrix.com> Signed-off-by: Jason Zaman gentoo.org> policy/modules/kernel/filesystem.if | 18 ++ policy/modules/system/xen.te| 1 + 2 files changed, 19 insertions(+) diff --git a/policy/modules/kernel/filesystem.if b/policy/modules/kernel/filesystem.if index aa855bd0..05ddc598 100644 --- a/policy/modules/kernel/filesystem.if +++ b/policy/modules/kernel/filesystem.if @@ -5328,6 +5328,24 @@ interface(`fs_manage_xenfs_files',` manage_files_pattern($1, xenfs_t, xenfs_t) ') + +## +## Map files a XENFS filesystem. +## +## +## +## Domain allowed access. +## +## +# +interface(`fs_mmap_xenfs_files',` + gen_require(` + type xenfs_t; + ') + + allow $1 xenfs_t:file map; +') + ## ## Do not audit attempts to create, diff --git a/policy/modules/system/xen.te b/policy/modules/system/xen.te index 2c95d0ca..82328cbb 100644 --- a/policy/modules/system/xen.te +++ b/policy/modules/system/xen.te @@ -459,6 +459,7 @@ files_read_usr_files(xenstored_t) fs_search_xenfs(xenstored_t) fs_manage_xenfs_files(xenstored_t) +fs_mmap_xenfs_files(xenstored_t) term_use_generic_ptys(xenstored_t)
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/, policy/modules/system/
commit: 49688047a9eaf2a136c50ecb7ad5097a9921e870 Author: Chris PeBenito ieee org> AuthorDate: Thu Nov 5 11:55:25 2020 + Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 16 09:03:43 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=49688047 filesystem, xen: Module version bump. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/kernel/filesystem.te | 2 +- policy/modules/system/xen.te| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/policy/modules/kernel/filesystem.te b/policy/modules/kernel/filesystem.te index f338e207..ef891c09 100644 --- a/policy/modules/kernel/filesystem.te +++ b/policy/modules/kernel/filesystem.te @@ -1,4 +1,4 @@ -policy_module(filesystem, 1.28.2) +policy_module(filesystem, 1.28.3) # diff --git a/policy/modules/system/xen.te b/policy/modules/system/xen.te index 82328cbb..232c3ee4 100644 --- a/policy/modules/system/xen.te +++ b/policy/modules/system/xen.te @@ -1,4 +1,4 @@ -policy_module(xen, 1.18.1) +policy_module(xen, 1.18.2) #
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: e5553f37a167cc7205e8550025fd2501ba7ed8b3
Author: Jason Zaman gentoo org>
AuthorDate: Tue Nov 17 03:46:22 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Sat Nov 28 22:55:51 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=e5553f37
getty: allow watching file /run/agetty.reload
avc: denied { watch } for pid=2485 comm="agetty" path="/run/agetty.reload"
dev="tmpfs" ino=22050 scontext=system_u:system_r:getty_t:s0
tcontext=system_u:object_r:getty_runtime_t:s0 tclass=file permissive=0
Signed-off-by: Jason Zaman perfinion.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/modules/system/getty.te | 1 +
1 file changed, 1 insertion(+)
diff --git a/policy/modules/system/getty.te b/policy/modules/system/getty.te
index ce9e4ded..f9514c77 100644
--- a/policy/modules/system/getty.te
+++ b/policy/modules/system/getty.te
@@ -47,6 +47,7 @@ allow getty_t getty_log_t:file { append_file_perms
create_file_perms setattr_fil
logging_log_filetrans(getty_t, getty_log_t, file)
allow getty_t getty_runtime_t:dir watch;
+allow getty_t getty_runtime_t:file watch;
manage_files_pattern(getty_t, getty_runtime_t, getty_runtime_t)
files_runtime_filetrans(getty_t, getty_runtime_t, file)
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: fb88733bbd3f7017f4baf778b9f147eb769b53e9
Author: Dave Sugar tresys com>
AuthorDate: Sat Sep 26 18:55:35 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Nov 16 09:03:43 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=fb88733b
Updates for corosync to work in enforcing
Allow corosync to map its own shared memory
Sep 26 18:45:02 localhost audispd: node=virtual type=AVC
msg=audit(1601145902.400:2972): avc: denied { map } for pid=6903
comm="corosync" path="/dev/shm/qb-6903-7028-31-FGGoGv/qb-request-cmap-header"
dev="tmpfs" ino=40759 scontext=system_u:system_r:corosync_t:s0
tcontext=system_u:object_r:corosync_tmpfs_t:s0 tclass=file permissive=1
Setup corosync lock file type
Sep 27 17:20:07 localhost audispd: node=virtual type=PATH
msg=audit(1601227207.522:3421): item=1 name="/var/lock/subsys/corosync"
inode=35029 dev=00:14 mode=0100640 ouid=0 ogid=0 rdev=00:00
obj=system_u:object_r:var_lock_t:s0 objtype=DELETE cap_fp=
cap_fi= cap_fe=0 cap_fver=0
Sep 27 17:34:49 localhost audispd: node=virtual type=AVC
msg=audit(1601228085.093:2862): avc: denied { read } for pid=6748
comm="corosync" name="lock" dev="dm-0" ino=13082
scontext=system_u:system_r:corosync_t:s0
tcontext=system_u:object_r:var_lock_t:s0 tclass=lnk_file permissive=1
Sep 27 17:34:49 localhost audispd: node=virtual type=AVC
msg=audit(1601228085.093:2862): avc: denied { search } for pid=6748
comm="corosync" name="lock" dev="tmpfs" ino=10248
scontext=system_u:system_r:corosync_t:s0
tcontext=system_u:object_r:var_lock_t:s0 tclass=dir permissive=1
Sep 27 17:34:49 localhost audispd: node=virtual type=AVC
msg=audit(1601228085.797:2882): avc: denied { add_name } for pid=7066
comm="touch" name="corosync" scontext=system_u:system_r:corosync_t:s0
tcontext=system_u:object_r:var_lock_t:s0 tclass=dir permissive=1
Sep 27 17:34:49 localhost audispd: node=virtual type=AVC
msg=audit(1601228085.797:2882): avc: denied { create } for pid=7066
comm="touch" name="corosync" scontext=system_u:system_r:corosync_t:s0
tcontext=system_u:object_r:var_lock_t:s0 tclass=file permissive=1
Sep 27 17:34:49 localhost audispd: node=virtual type=AVC
msg=audit(1601228085.797:2882): avc: denied { write open } for pid=7066
comm="touch" path="/run/lock/subsys/corosync" dev="tmpfs" ino=35048
scontext=system_u:system_r:corosync_t:s0
tcontext=system_u:object_r:var_lock_t:s0 tclass=file permissive=1
On RHEL7 systemd executes '/usr/share/corosync/corosync start' to start, label
these files.
Signed-off-by: Dave Sugar tresys.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/modules/services/corosync.fc | 7 +++
policy/modules/services/corosync.te | 7 +++
2 files changed, 14 insertions(+)
diff --git a/policy/modules/services/corosync.fc
b/policy/modules/services/corosync.fc
index 51a558c8..1c4787d7 100644
--- a/policy/modules/services/corosync.fc
+++ b/policy/modules/services/corosync.fc
@@ -6,8 +6,15 @@
/usr/sbin/corosync --
gen_context(system_u:object_r:corosync_exec_t,s0)
/usr/sbin/corosync-notifyd --
gen_context(system_u:object_r:corosync_exec_t,s0)
+ifdef(`distro_redhat',`
+/usr/share/corosync/corosync --
gen_context(system_u:object_r:corosync_exec_t,s0)
+/usr/share/corosync/corosync-notifyd --
gen_context(system_u:object_r:corosync_exec_t,s0)
+')
+
/var/lib/corosync(/.*)?
gen_context(system_u:object_r:corosync_var_lib_t,s0)
+/var/lock/subsys/corosync --
gen_context(system_u:object_r:corosync_lock_t,s0)
+
/var/log/cluster/corosync\.log.* --
gen_context(system_u:object_r:corosync_var_log_t,s0)
/run/cman_.* -s gen_context(system_u:object_r:corosync_runtime_t,s0)
diff --git a/policy/modules/services/corosync.te
b/policy/modules/services/corosync.te
index 36a6ffab..b85b1c9a 100644
--- a/policy/modules/services/corosync.te
+++ b/policy/modules/services/corosync.te
@@ -13,6 +13,9 @@ domain_obj_id_change_exemption(corosync_t)
type corosync_initrc_exec_t;
init_script_file(corosync_initrc_exec_t)
+type corosync_lock_t;
+files_lock_file(corosync_lock_t)
+
type corosync_runtime_t alias corosync_var_run_t;
files_runtime_file(corosync_runtime_t)
@@ -43,6 +46,9 @@ allow corosync_t self:shm create_shm_perms;
allow corosync_t self:unix_dgram_socket sendto;
allow corosync_t self:unix_stream_socket { accept connectto listen };
+manage_files_pattern(corosync_t, corosync_lock_t, corosync_lock_t)
+files_lock_filetrans(corosync_t, corosync_lock_t, file)
+
manage_dirs_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
manage_files_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
relabel_files_pattern(corosync_t, corosync_tmp_t, corosync_tmp_t)
@@ -50,6 +56,7 @@ files_tmp_filetrans(corosync_t, corosync_tmp_t, { dir file })
manage_dirs_pattern(corosync_t, corosync_tmpfs_t, corosync_tmpfs_t)
manage_files_pattern(corosync_t,
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/system/
commit: f5fb96b1a6cbde18dcf9bde9b29a84fb81acdb1e
Author: Guido Trentalancia trentalancia com>
AuthorDate: Mon Nov 9 14:43:01 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Nov 16 09:03:43 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=f5fb96b1
Add LVM module permissions needed to open cryptsetup devices.
Signed-off-by: Guido Trentalancia trentalancia.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/modules/system/lvm.te | 2 ++
1 file changed, 2 insertions(+)
diff --git a/policy/modules/system/lvm.te b/policy/modules/system/lvm.te
index 23eaceb2..58517502 100644
--- a/policy/modules/system/lvm.te
+++ b/policy/modules/system/lvm.te
@@ -177,6 +177,8 @@ allow lvm_t self:netlink_kobject_uevent_socket
create_socket_perms;
allow lvm_t self:sem create_sem_perms;
# gt: the following is for sockets in the AF_ALG namespace (userspace
interface to the kernel Crypto API)
allow lvm_t self:socket create_stream_socket_perms;
+# gt: the following allows opening cryptsetup devices
+allow lvm_t self:key { search write };
allow lvm_t self:unix_stream_socket { connectto create_stream_socket_perms };
allow lvm_t clvmd_t:unix_stream_socket { connectto rw_socket_perms };
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: 8fff7fea29cd303fb618520b0d792e6ee0cbf0a7
Author: Dave Sugar tresys com>
AuthorDate: Sat Sep 26 19:07:30 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Nov 16 09:03:43 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=8fff7fea
Allow pacemaker to map/read/write corosync shared memory files
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145893.104:2915): avc: denied { read write } for pid=7173
comm="stonithd" name="qb-request-cmap-header" dev="tmpfs" ino=37263
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:corosync_tmpfs_t:s0 tclass=file permissive=1
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145893.104:2915): avc: denied { open } for pid=7173
comm="stonithd" path="/dev/shm/qb-7065-7173-28-i3gF6U/qb-request-cmap-header"
dev="tmpfs" ino=37263 scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:corosync_tmpfs_t:s0 tclass=file permissive=1
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145893.104:2916): avc: denied { map } for pid=7173
comm="stonithd" path="/dev/shm/qb-7065-7173-28-i3gF6U/qb-request-cmap-header"
dev="tmpfs" ino=37263 scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:corosync_tmpfs_t:s0 tclass=file permissive=1
Signed-off-by: Dave Sugar tresys.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/modules/services/corosync.if | 19 +++
policy/modules/services/pacemaker.te | 1 +
2 files changed, 20 insertions(+)
diff --git a/policy/modules/services/corosync.if
b/policy/modules/services/corosync.if
index f86dbed3..ee54bc9a 100644
--- a/policy/modules/services/corosync.if
+++ b/policy/modules/services/corosync.if
@@ -97,6 +97,25 @@ interface(`corosync_stream_connect',`
stream_connect_pattern($1, corosync_runtime_t, corosync_runtime_t,
corosync_t)
')
+##
+##
+## Memmap, read and write corosync tmpfs files.
+##
+##
+##
+## Domain allowed access.
+##
+##
+#
+interface(`corosync_mmap_rw_tmpfs',`
+ gen_require(`
+ type corosync_tmpfs_t;
+ ')
+
+ fs_search_tmpfs($1)
+ mmap_rw_files_pattern($1, corosync_tmpfs_t, corosync_tmpfs_t)
+')
+
##
##
## Read and write corosync tmpfs files.
diff --git a/policy/modules/services/pacemaker.te
b/policy/modules/services/pacemaker.te
index 70d976ea..69d619a1 100644
--- a/policy/modules/services/pacemaker.te
+++ b/policy/modules/services/pacemaker.te
@@ -121,6 +121,7 @@ tunable_policy(`pacemaker_startstop_all_services',`
optional_policy(`
corosync_read_log(pacemaker_t)
+ corosync_mmap_rw_tmpfs(pacemaker_t)
corosync_stream_connect(pacemaker_t)
')
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: 51a5f6d799fac283615b106a05916e3179123db5
Author: Dave Sugar tresys com>
AuthorDate: Sun Sep 27 02:07:21 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Nov 16 09:03:43 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=51a5f6d7
pacemaker systemd permissions
Allow pacemaker to get status of all running services and reload systemd
Sep 27 01:59:16 localhost audispd: node=virtual type=USER_AVC
msg=audit(1601171956.494:2945): pid=1 uid=0 auid=4294967295 ses=4294967295
subj=system_u:system_r:init_t:s0 msg='avc: denied { status } for auid=n/a
uid=0 gid=0 path="/usr/lib/systemd/system/target-monitor@.service"
cmdline="/usr/libexec/pacemaker/lrmd" scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:systemd_unit_t:s0 tclass=service
exe="/usr/lib/systemd/systemd" sauid=0 hostname=? addr=? terminal=?'
Sep 29 01:46:09 localhost audispd: node=virtual type=USER_AVC
msg=audit(1601343969.962:2974): pid=1 uid=0 auid=4294967295 ses=4294967295
subj=system_u:system_r:init_t:s0 msg='avc: denied { reload } for auid=n/a
uid=0 gid=0 cmdline="/usr/libexec/pacemaker/lrmd"
scontext=system_u:system_r:pacemaker_t:s0 tcontext=system_u:system_r:init_t:s0
tclass=system exe="/usr/lib/systemd/systemd" sauid=0 hostname=? addr=?
terminal=?'
Allow pacemaker to start/sotp all units (when enabled)
Sep 30 14:37:14 localhost audispd: node=virtual type=USER_AVC
msg=audit(1601476634.877:3075): pid=1 uid=0 auid=4294967295 ses=4294967295
subj=system_u:system_r:init_t:s0 msg='avc: denied { start } for auid=n/a
uid=0 gid=0 path="/usr/lib/systemd/system/target-monitor@.service"
cmdline="/usr/libexec/pacemaker/lrmd" scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:systemd_unit_t:s0 tclass=service
exe="/usr/lib/systemd/systemd" sauid=0 hostname=? addr=? terminal=?'
Allow for dynamic creation of unit files (with private type)
By using a private type pacemaker doesn't need permission to
read/write all init_runtime_t files.
Sep 30 14:37:14 localhost audispd: node=virtual type=AVC
msg=audit(1601476634.759:3071): avc: denied { write } for pid=5075
comm="lrmd" name="system" dev="tmpfs" ino=1177
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:init_runtime_t:s0 tclass=dir permissive=1
Sep 30 14:37:14 localhost audispd: node=virtual type=AVC
msg=audit(1601476634.759:3071): avc: denied { add_name } for pid=5075
comm="lrmd" name="target-monitor my.service.d"
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:init_runtime_t:s0 tclass=dir permissive=1
Sep 30 14:37:14 localhost audispd: node=virtual type=AVC
msg=audit(1601476634.759:3071): avc: denied { create } for pid=5075
comm="lrmd" name="target-monitor my.service.d"
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:init_runtime_t:s0 tclass=dir permissive=1
Sep 30 14:37:14 localhost audispd: node=virtual type=AVC
msg=audit(1601476634.761:3072): avc: denied { create } for pid=5075
comm="lrmd" name="50-pacemaker.conf" scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:init_runtime_t:s0 tclass=file permissive=1
Sep 30 14:37:14 localhost audispd: node=virtual type=AVC
msg=audit(1601476634.761:3072): avc: denied { write open } for pid=5075
comm="lrmd" path="/run/systemd/system/target-monitor
my.service.d/50-pacemaker.conf" dev="tmpfs" ino=48933
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:init_runtime_t:s0 tclass=file permissive=1
Sep 30 14:37:14 localhost audispd: node=virtual type=AVC
msg=audit(1601476634.761:3073): avc: denied { getattr } for pid=5075
comm="lrmd" path="/run/systemd/system/target-monitor
my.service.d/50-pacemaker.conf" dev="tmpfs" ino=48933
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:init_runtime_t:s0 tclass=file permissive=1
Signed-off-by: Dave Sugar tresys.com>
Signed-off-by: Jason Zaman gentoo.org>
policy/modules/services/pacemaker.te | 24
1 file changed, 24 insertions(+)
diff --git a/policy/modules/services/pacemaker.te
b/policy/modules/services/pacemaker.te
index f7a18a7f..70d976ea 100644
--- a/policy/modules/services/pacemaker.te
+++ b/policy/modules/services/pacemaker.te
@@ -5,6 +5,13 @@ policy_module(pacemaker, 1.6.0)
# Declarations
#
+##
+##
+## Allow pacemaker to start/stop services
+##
+##
+gen_tunable(pacemaker_startstop_all_services, false)
+
type pacemaker_t;
type pacemaker_exec_t;
init_daemon_domain(pacemaker_t, pacemaker_exec_t)
@@ -18,6 +25,9 @@ logging_log_file(pacemaker_log_t)
type pacemaker_runtime_t alias pacemaker_var_run_t;
files_runtime_file(pacemaker_runtime_t)
+type pacemaker_runtime_unit_t;
+init_unit_file(pacemaker_runtime_unit_t)
+
type pacemaker_tmp_t;
files_tmp_file(pacemaker_tmp_t)
@@ -61,6 +71,10 @@ manage_dirs_pattern(pacemaker_t, pacemaker_runtime_t,
pacemaker_runtime_t)
manage_files_pattern(pacemaker_t,
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: 054510904041ecc1b8cbacfbfd853c88e01423d9
Author: Dave Sugar tresys com>
AuthorDate: Sun Sep 27 00:43:44 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Mon Nov 16 09:03:43 2020 +
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=05451090
To get pacemaker working in enforcing
Allow pacemaker to map its shared memory
Sep 27 00:30:32 localhost audispd: node=virtual type=AVC
msg=audit(1601166632.229:2936): avc: denied { map } for pid=7173 comm="cib"
path="/dev/shm/qb-7173-7465-14-5Voxju/qb-request-cib_rw-header" dev="tmpfs"
ino=39707 scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:pacemaker_tmpfs_t:s0 tclass=file permissive=1
Label pacemaker private log file
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145892.788:2902): avc: denied { write } for pid=7168
comm="pacemakerd" name="/" dev="tmpfs" ino=13995
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:var_log_t:s0 tclass=dir permissive=1
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145892.788:2902): avc: denied { add_name } for pid=7168
comm="pacemakerd" name="pacemaker.log"
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:var_log_t:s0 tclass=dir permissive=1
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145892.788:2902): avc: denied { create } for pid=7168
comm="pacemakerd" name="pacemaker.log"
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:var_log_t:s0 tclass=file permissive=1
Sep 26 18:44:56 localhost audispd: node=virtual type=AVC
msg=audit(1601145892.788:2902): avc: denied { append open } for pid=7168
comm="pacemakerd" path="/var/log/pacemaker.log" dev="tmpfs" ino=32670
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:var_log_t:s0 tclass=file permissive=1
It writes to log, but also reads
Sep 27 00:30:30 localhost audispd: node=virtual type=AVC
msg=audit(1601166628.381:2892): avc: denied { read } for pid=7177
comm="pengine" name="pacemaker.log" dev="tmpfs" ino=35813
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:pacemaker_log_t:s0 tclass=file permissive=1
Pacemaker can read stuff in /usr/share/pacemaker/
Sep 27 00:30:30 localhost audispd: node=virtual type=AVC
msg=audit(1601166628.383:2893): avc: denied { read } for pid=7173 comm="cib"
name="pacemaker-2.10.rng" dev="dm-0" ino=76508
scontext=system_u:system_r:pacemaker_t:s0 tcontext=system_u:object_r:usr_t:s0
tclass=file permissive=1
Sep 27 00:30:30 localhost audispd: node=virtual type=AVC
msg=audit(1601166628.383:2893): avc: denied { open } for pid=7173 comm="cib"
path="/usr/share/pacemaker/pacemaker-2.10.rng" dev="dm-0" ino=76508
scontext=system_u:system_r:pacemaker_t:s0 tcontext=system_u:object_r:usr_t:s0
tclass=file permissive=1
pacemaker dbus related stuff
Sep 27 00:30:50 localhost audispd: node=virtual type=AVC
msg=audit(1601166650.761:2953): avc: denied { write } for pid=7175
comm="lrmd" name="system_bus_socket" dev="tmpfs" ino=13960
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:object_r:system_dbusd_runtime_t:s0 tclass=sock_file
permissive=1
Sep 27 00:30:50 localhost audispd: node=virtual type=AVC
msg=audit(1601166650.761:2953): avc: denied { connectto } for pid=7175
comm="lrmd" path="/run/dbus/system_bus_socket"
scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023
tclass=unix_stream_socket permissive=1
Sep 27 00:30:50 localhost audispd: node=virtual type=USER_AVC
msg=audit(1601166650.763:2954): pid=2798 uid=81 auid=4294967295 ses=4294967295
subj=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 msg='avc: denied {
send_msg } for msgtype=method_call interface=org.freedesktop.DBus member=Hello
dest=org.freedesktop.DBus spid=7175 scontext=system_u:system_r:pacemaker_t:s0
tcontext=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 tclass=dbus
exe="/usr/bin/dbus-daemon" sauid=81 hostname=? addr=? terminal=?'
Sep 27 00:30:50 localhost audispd: node=virtual type=USER_AVC
msg=audit(1601166650.764:2955): pid=2798 uid=81 auid=4294967295 ses=4294967295
subj=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 msg='avc: denied {
send_msg } for msgtype=method_call interface=org.freedesktop.systemd1.Manager
member=LoadUnit dest=org.freedesktop.systemd1 spid=7175 tpid=1
scontext=system_u:system_r:pacemaker_t:s0 tcontext=system_u:system_r:init_t:s0
tclass=dbus exe="/usr/bin/dbus-daemon" sauid=81 hostname=? addr=? terminal=?'
Sep 27 00:30:50 localhost audispd: node=virtual type=USER_AVC
msg=audit(1601166650.767:2959): pid=2798 uid=81 auid=4294967295 ses=4294967295
subj=system_u:system_r:system_dbusd_t:s0-s0:c0.c1023 msg='avc: denied {
send_msg } for msgtype=method_return dest=:1.12 spid=1 tpid=7175
scontext=system_u:system_r:init_t:s0 tcontext=system_u:system_r:pacemaker_t:s0
tclass=dbus
[gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/services/
commit: 998aa259af68dfd78d712d4688f03fd1be4a78b0 Author: Chris PeBenito ieee org> AuthorDate: Tue Oct 13 19:25:24 2020 + Commit: Jason Zaman gentoo org> CommitDate: Mon Nov 16 09:03:43 2020 + URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=998aa259 corosync, pacemaker: Module version bump. Signed-off-by: Chris PeBenito ieee.org> Signed-off-by: Jason Zaman gentoo.org> policy/modules/services/corosync.te | 2 +- policy/modules/services/pacemaker.te | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/policy/modules/services/corosync.te b/policy/modules/services/corosync.te index b85b1c9a..4fbc7426 100644 --- a/policy/modules/services/corosync.te +++ b/policy/modules/services/corosync.te @@ -1,4 +1,4 @@ -policy_module(corosync, 1.6.0) +policy_module(corosync, 1.6.1) # diff --git a/policy/modules/services/pacemaker.te b/policy/modules/services/pacemaker.te index 69d619a1..a34f5536 100644 --- a/policy/modules/services/pacemaker.te +++ b/policy/modules/services/pacemaker.te @@ -1,4 +1,4 @@ -policy_module(pacemaker, 1.6.0) +policy_module(pacemaker, 1.6.1) #
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/luajson/
commit: 9477144781ba96c928ac473966ace6d6b5f3b06e
Author: Marek Szuba gentoo org>
AuthorDate: Sat Nov 28 23:02:07 2020 +
Commit: Marek Szuba gentoo org>
CommitDate: Sat Nov 28 23:07:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94771447
dev-lua/luajson: bump to 1.3.4 and migrate to lua.eclass
Can't run tests because they require lunitx (which in turn uses Lake,
which we haven't got in the tree either) but since upstream says in the
README which Lua implementations are supported, let's take their word
for it.
Closes: https://bugs.gentoo.org/752903
Signed-off-by: Marek Szuba gentoo.org>
dev-lua/luajson/Manifest | 1 +
dev-lua/luajson/luajson-1.3.4.ebuild | 37
profiles/package.mask| 1 +
3 files changed, 39 insertions(+)
diff --git a/dev-lua/luajson/Manifest b/dev-lua/luajson/Manifest
index 94e156d2659..29fa7b008cb 100644
--- a/dev-lua/luajson/Manifest
+++ b/dev-lua/luajson/Manifest
@@ -1 +1,2 @@
DIST luajson-1.3.3.tar.gz 42653 BLAKE2B
2bc7310317a1279906681c2de284dc7b9d50766c0c21c606da746d0e709168e5364c3a821798f3ce423dfdd246162212525c1fee7c13cb5f0999db56d1e5e3c3
SHA512
9b507148afaf59871f97e7cf78ad35dc01497d553699d1d1a928543fad6a375aebc3852da86d51d744f10ab2ec24c7b1d7c380852da8134ae05f2f22f6f200c2
+DIST luajson-1.3.4.tar.gz 46941 BLAKE2B
50c8c20c487f92fd19b3e080a87eec58c2cb30d83dfc6acd7aca3f155a04f85a194c069f735a2881e14b0eb3fd3b16e4a75ea625ac81c65b9e25cb1c3601673c
SHA512
d24dc8399337b96cde3254a83e5cc1fa995b76f0e1fae54ad91a490f0a6f4c5d0927919320f99d7bc4238ac5529d0ea57435c6be2519fb52e2a83f5005fbc4f7
diff --git a/dev-lua/luajson/luajson-1.3.4.ebuild
b/dev-lua/luajson/luajson-1.3.4.ebuild
new file mode 100644
index 000..f06cd069d62
--- /dev/null
+++ b/dev-lua/luajson/luajson-1.3.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua
+
+DESCRIPTION="JSON Parser/Constructor for Lua"
+HOMEPAGE="https://www.eharning.us/wiki/luajson/;
+SRC_URI="https://github.com/harningt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="dev-lua/lpeg[${LUA_USEDEP}]"
+
+# Require lunitx, which is not in the tree yet
+RESTRICT="test"
+
+DOCS=( README.md docs/ReleaseNotes-${PV}.txt docs/LuaJSON.txt )
+
+# nothing to compile
+src_compile() { :; }
+
+lua_src_install() {
+ emake DESTDIR="${ED}" INSTALL_LMOD="$(lua_get_lmod_dir)" install
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+ einstalldocs
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index ef27778a2a2..daf7ed3e732 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -519,6 +519,7 @@ dev-lua/luacrypto
>=dev-lua/lua_cliargs-3.0_p2-r100
>=dev-lua/lua-term-0.7-r100
>=dev-lua/luafilesystem-1.8.0-r100
+>=dev-lua/luajson-1.3.4
>=dev-lua/luasec-0.9-r100
>=dev-lua/luasocket-3.0_rc1_p20200328-r100
>=dev-lua/luassert-1.8.0-r100
[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/files/, app-text/calibre/
commit: 1d13714f2a66bb0eb4ea88b33dc2404f6d4120df
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Nov 28 22:50:26 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Nov 28 22:50:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d13714f
app-text/calibre: Fix build with icu-68
Closes: https://bugs.gentoo.org/752015
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel gentoo.org>
app-text/calibre/calibre-4.22.0.ebuild| 3 +-
app-text/calibre/calibre-4.23.0.ebuild| 3 +-
app-text/calibre/calibre-5.4.2.ebuild | 1 +
app-text/calibre/files/calibre-4.22.0-icu68.patch | 37 +++
4 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/app-text/calibre/calibre-4.22.0.ebuild
b/app-text/calibre/calibre-4.22.0.ebuild
index 7dca7d16c3d..317dde69399 100644
--- a/app-text/calibre/calibre-4.22.0.ebuild
+++ b/app-text/calibre/calibre-4.22.0.ebuild
@@ -122,7 +122,8 @@ src_prepare() {
# disable_plugins: walking sec-hole, wait for upstream to use GHNS
interface
eapply \
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
+ "${FILESDIR}/${PN}-disable_plugins.patch" \
+ "${FILESDIR}/${PN}-4.22.0-icu68.patch"
eapply_user
diff --git a/app-text/calibre/calibre-4.23.0.ebuild
b/app-text/calibre/calibre-4.23.0.ebuild
index 2e529363d2c..fffb7f953b4 100644
--- a/app-text/calibre/calibre-4.23.0.ebuild
+++ b/app-text/calibre/calibre-4.23.0.ebuild
@@ -122,7 +122,8 @@ src_prepare() {
# disable_plugins: walking sec-hole, wait for upstream to use GHNS
interface
eapply \
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
- "${FILESDIR}/${PN}-disable_plugins.patch"
+ "${FILESDIR}/${PN}-disable_plugins.patch" \
+ "${FILESDIR}/${PN}-4.22.0-icu68.patch"
eapply_user
diff --git a/app-text/calibre/calibre-5.4.2.ebuild
b/app-text/calibre/calibre-5.4.2.ebuild
index 6c46bbdb063..ca89fb15aef 100644
--- a/app-text/calibre/calibre-5.4.2.ebuild
+++ b/app-text/calibre/calibre-5.4.2.ebuild
@@ -124,6 +124,7 @@ src_prepare() {
eapply \
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
"${FILESDIR}/${PN}-disable_plugins.patch" \
+ "${FILESDIR}/${PN}-4.22.0-icu68.patch" \
"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
eapply_user
diff --git a/app-text/calibre/files/calibre-4.22.0-icu68.patch
b/app-text/calibre/files/calibre-4.22.0-icu68.patch
new file mode 100644
index 000..33cd7830d35
--- /dev/null
+++ b/app-text/calibre/files/calibre-4.22.0-icu68.patch
@@ -0,0 +1,37 @@
+From c211f9b17af410463ce9cfc9b1b100228b51720f Mon Sep 17 00:00:00 2001
+From: Lars Wendler
+Date: Sat, 31 Oct 2020 10:44:36 +0100
+Subject: [PATCH] Fix build with icu-68.1
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler
+---
+ src/calibre/utils/icu.c | 4 ++--
+ src/calibre/utils/matcher.c | 1 -
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/calibre/utils/icu.c b/src/calibre/utils/icu.c
+index 62d05de310..4e918492d9 100644
+--- a/src/calibre/utils/icu.c
b/src/calibre/utils/icu.c
+@@ -238,14 +238,14 @@ icu_Collator_contains(icu_Collator *self, PyObject
*args) {
+
+ a = python_to_icu(a_, );
+ if (a == NULL) goto end;
+-if (asz == 0) { found = TRUE; goto end; }
++if (asz == 0) { found = 1; goto end; }
+ b = python_to_icu(b_, );
+ if (b == NULL) goto end;
+
+ search = usearch_openFromCollator(a, asz, b, bsz, self->collator, NULL,
);
+ if (U_SUCCESS(status)) {
+ pos = usearch_first(search, );
+-if (pos != USEARCH_DONE) found = TRUE;
++if (pos != USEARCH_DONE) found = 1;
+ }
+ end:
+ if (search != NULL) usearch_close(search);
+--
+2.29.2
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/tensorflow/
commit: fdec981a9b8bf557185abfc4e9c74f0341b23c7e
Author: Jason Zaman gentoo org>
AuthorDate: Sat Nov 28 21:48:26 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Sat Nov 28 22:41:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdec981a
sci-libs/tensorflow: bump 2.4.0_rc3
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jason Zaman gentoo.org>
sci-libs/tensorflow/Manifest | 4 ++--
.../{tensorflow-2.4.0_rc1.ebuild => tensorflow-2.4.0_rc3.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index aac7a9c5d30..4b1dec94684 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -52,9 +52,9 @@ DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B
8a8ace4b64fd9eda1932
DIST tensorflow-2.1.0.tar.gz 41637803 BLAKE2B
63aac95cdb71097d2e7a257a691a2b51703fb22d2535395494adebfae0d3f97f8dd9e0deaadf1c2f3d3d26138066a7c6fb9b9728b5b0ac3d54360d7b5e4bebff
SHA512
6d09ba3c097e4b3d712e7164d649841572c418d56c207eea6d31e3b1851b84ce57e82801d9887d84cfd8fcf990a3ea4c4b4b05265f8d625509986412c230c3c6
DIST tensorflow-2.2.0.tar.gz 42100791 BLAKE2B
8b773ae9945ca267af33a34d86f6aef02310976bea1cdd98858d1405e8da845640b72a073b71fcfccb2b73f08600a5eada2c2332a8d9480bba71e9f25dbb2220
SHA512
94a2663497d333d543f363e9fea94fbcfdcdbbc0dfbaf009ba9181a808713aeb78f9b8805f56bea5fd3925a36f105427b3996795750589f378d8afbdadc2b86d
DIST tensorflow-2.3.1.tar.gz 46544608 BLAKE2B
c3cb0954fcd060b95d63895cbeeca20f6af29ade999dc43db5fe010d6b33b6f650047d529f174a1663c23440a56e057e2f97c503a4a40bcdac9374b549f3220e
SHA512
e497ef4564f50abf9f918be4522cf702f4cf945cb1ebf83af1386ac4ddc7373b3ba70c7f803f8ca06faf2c6b5396e60b1e0e9b97bfbd667e733b08b6e6d70ef0
-DIST tensorflow-2.4.0_rc1.tar.gz 53249752 BLAKE2B
14f4c1d37c9086485b768fa17c9cbdff2a5cb40bf4456aff8739b4ea224889551b08c02a7623866f2e7af3c7ec4a940de2b41cd64530ee4b47508e1747ad15db
SHA512
38f06026dccff91c981e8ca0d1164f8f78710238184b6163e2e8ead26863fcf7daa074b1721114d0ee8efff127c42d94b65b696368ad91d74fcb81b5ef41a225
+DIST tensorflow-2.4.0_rc3.tar.gz 53251141 BLAKE2B
45a05fc1bc6f5f940487ecfd53a5dd37718a39a2a3dfd536cb6e41ba1da9fbac9e166aeb288ad122adc6474af94c13a2370779c37aa7162de3cb0c015acd5c44
SHA512
c02901fb41aa996a4d3c4a118cd76c62502e99be64f6ecf98208b2c65ed9f8c87c4060dcc983f6fe8280207b3bfa967e5f325e2d926aa1b4429f99fc0153c2e1
DIST tensorflow-patches-2.1.0.tar.bz2 5737 BLAKE2B
67f5004312389ed19e810aad9f2d5d4839d806b5a7422963520e0dff06b91346683647db757ac463af13ca70861a7ed9c94be242910abacc6be350e162947225
SHA512
a20bfb619d59e0d2741a27ce36e3d38dbb7a5a706d6bc56f8aa94b5b72288139ad301fc06390b128ef1c3a88b758d09d0224351590dedcda9c5309cc55af6fed
DIST tensorflow-patches-2.2.0-r1.tar.bz2 3890 BLAKE2B
cf4e0d579992cd09136fe3a11c5016e7b996ea959dad9f3a1ccff2fa623c2c4eab1c6673dfaf08b3b01220fd00c9edd5966e1162049f6d1e4fe5af280f491850
SHA512
8d07c9351b75faf90a137f65c2e6147d884744c5ab9b0bacadfa7bdc7b66ec2ec92920c7d23396bb70f7f4fb290f3f818591f23c6a4e91ab1a79290cb4ea1533
DIST tensorflow-patches-2.3.1-r1.tar.bz2 12300 BLAKE2B
068c127d7e980baf63068c524c9411e4f19bb79ee369221cf474a964a15ad340b28bde09504a8d524167eea036caf9d2dc52d0ad7ae1e52a76d1892833b033a0
SHA512
510676e4f999c12331a61bfeeca45b2526292d8bca8b0b42c1d8d466bc52722075fbd4df26a5f67dbe1ca4ccd9059e783c113cf694b436ff48c8114c99234cd3
DIST tensorflow-patches-2.3.1.tar.bz2 11361 BLAKE2B
22ddd827f616e33fd259ce2b7da5cda539d856701ad108d1d3b52d1dab660bcddc809fd9e9db5e6496552df080493b0205b83a58dc32808dc70c60a5878aa8af
SHA512
cdfc3407c775f8529cb8eb939b1046a7094ff999b8225e419e2ab4be19ecba6d853ebd8cd2dda77a7f60425a440f4d60bf3afca4a80688f0cba9967e14f8b8fb
-DIST tensorflow-patches-2.4.0_rc1.tar.bz2 1843 BLAKE2B
6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194
SHA512
abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
+DIST tensorflow-patches-2.4.0_rc3.tar.bz2 1843 BLAKE2B
6d4188471502e4411a5a7a6e731142af38421961600c52e7d76d137f952a5b8327dc8d8b4a40b60d3fb46130fe3d40ae2adc3d60d9a882f9d9b07d424e45e194
SHA512
abf9fbd870a8fa59b9d4e1b8260c4fbb5badeeca3e2b77caa031036759302bccae4adf91b291bc7a12df3c679b887338a8cd98d41847eb8ddd0c2bf4b8ccf342
diff --git a/sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
b/sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
similarity index 99%
rename from sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
rename to sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
index 1481f308418..3ffae5ad6f7 100644
--- a/sci-libs/tensorflow/tensorflow-2.4.0_rc1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-2.4.0_rc3.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
>=net-libs/google-cloud-cpp-0.10.0
>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: sci-visualization/tensorboard/
commit: 2f640640e5e16b210c3f0ad1523154df783dde81
Author: Jason Zaman gentoo org>
AuthorDate: Sat Nov 28 21:44:45 2020 +
Commit: Jason Zaman gentoo org>
CommitDate: Sat Nov 28 22:41:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f640640
sci-visualization/tensorboard: bump 2.4.0
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Jason Zaman gentoo.org>
sci-visualization/tensorboard/Manifest | 1 +
.../tensorboard/tensorboard-2.4.0.ebuild | 63 ++
2 files changed, 64 insertions(+)
diff --git a/sci-visualization/tensorboard/Manifest
b/sci-visualization/tensorboard/Manifest
index 248a8652d06..76cda98bc3c 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,3 +1,4 @@
DIST tensorboard-2.1.0.zip 3835182 BLAKE2B
c2c7dbc1ba4b85c52df6e693e1bd425bd76fe6db7ca25582b57d9c65c68b191dcdba2623ab0560139f1cac1bdf5c7a47261daaaf51fca46f2c5bf441f832a6fd
SHA512
7463ace0863b90312a62a7fa96f4eca0147e85cf46ff21729f8996a794d54e14d876d3abe083d6aa4efd8e4e1582f7d5029de367f199981a34d4057b558bc51c
DIST tensorboard-2.2.1.zip 2950617 BLAKE2B
487ad01981f994b23cb5fca8b60d9ed5f13ba13735d2613d1f3154eec9791b4b3068fb9fd50e75e16682e09ceb8a9ed8533ca2c43b6dea73db3adaeef15a889b
SHA512
e96f8853d282dc19911cf2210ece0a4d7239f37dcba82e91697c80881fbcc21f12e4ba3e7d2eea7a84c9bb5b6521bf488d93d2312e55af9ec2d2c20f135d94fa
DIST tensorboard-2.3.0.zip 6789437 BLAKE2B
34fe0ac903f6b79fc1ddebd2fab3d64e48a4ef9bb6159494e6b3ec5444ab6ad339f5ca7e4e478ec03dc7a788bbce6a4bd3ce253640136079a7a470f01f7b3a48
SHA512
d4cfdc8dbf030c022ecd635249f643d158c92274b142cd3de93cd8877c47cf59b9aca9aab12a971b986b84c7396bed3d7a012837b08d9dee6b0e53dc56e9fcbe
+DIST tensorboard-2.4.0.zip 10631832 BLAKE2B
e892c3f62855bd900320adbbea2758191296e2863e8865f4ffed3c5623fe5273a5a26554504b63db58c60d2a8c407e234d6cf3edc3868c88dfebd894def99859
SHA512
2301f526a98ac85cf5d182fff0f565c86883ec795bbaf2322696416621c8473d850a3f508079f89ca2a86a05fe020acde1282b72e2bb5ad77aab2d0e5ea2db4f
diff --git a/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
b/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
new file mode 100644
index 000..9d1a9356334
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.4.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit python-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/;
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl
-> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-python/bleach[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}]
+ >=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}]
+ dev-python/grpcio[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+ dev-python/werkzeug[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+ ${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ eapply_user
+
+ rm -rf "${S}/${PN}/_vendor/bleach" || die
+ rm -rf "${S}/${PN}/_vendor/html5lib" || die
+ sed -i -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d'
"${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+
+ find "${S}/${PN}" -name '*.py' -exec sed -i \
+ -e 's/^from tensorboard\._vendor import html5lib/import
html5lib/' \
+ -e 's/^from tensorboard\._vendor import bleach/import bleach/' \
+ -e 's/^from tensorboard\._vendor\.html5lib/from html5lib/' \
+ -e 's/^from tensorboard\._vendor\.bleach/from bleach/' \
+ {} + || die "failed to unvendor"
+
+ sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" ||
die "failed to remove plugin deps"
+}
+
+src_install() {
+ do_install() {
+ python_domodule "${PN}"
+ python_domodule "${P}.dist-info"
+ }
+ python_foreach_impl do_install
+}
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/mpack/
commit: 370d960c1d6725cf89e35ea7e542405e532d6059
Author: Marek Szuba gentoo org>
AuthorDate: Sat Nov 28 22:14:40 2020 +
Commit: Marek Szuba gentoo org>
CommitDate: Sat Nov 28 22:28:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=370d960c
dev-lua/mpack: migrate to lua.eclass
Had to suppress tests for the luajit target (one of the tests
checks for memory leaks and LuaJIT does leak memory) as well as prevent
the module from being unnecessarily linked against liblua (upstream have
already fixed this, unfortunately a bump to a recent version would not be
trivial). Otherwise, simple enough.
Closes: https://bugs.gentoo.org/752906
Signed-off-by: Marek Szuba gentoo.org>
dev-lua/mpack/mpack-1.0.4-r100.ebuild | 86 +++
profiles/package.mask | 1 +
2 files changed, 87 insertions(+)
diff --git a/dev-lua/mpack/mpack-1.0.4-r100.ebuild
b/dev-lua/mpack/mpack-1.0.4-r100.ebuild
new file mode 100644
index 000..7aca1045a87
--- /dev/null
+++ b/dev-lua/mpack/mpack-1.0.4-r100.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Lua bindings for libmpack"
+HOMEPAGE="https://github.com/libmpack/libmpack/;
+SRC_URI="https://github.com/libmpack/libmpack/archive/${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/libmpack-${PV}/binding/lua"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ test? (
+ ${RDEPEND}
+ dev-lua/busted[${LUA_USEDEP}]
+ )"
+
+lua_src_compile() {
+ # Make sure we have got no leftovers from other implementations.
+ # There is no 'clean' target in the makefile, though.
+ rm -f ${PN}.so
+
+ # We set LUA_LIB to an empty string while building version 1.0.4 because
+ # compiled Lua modules must not link against liblua. This has already
been
+ # fixed upstream.
+ emake \
+ CC="$(tc-getCC)" \
+ USE_SYSTEM_LUA=yes \
+ LUA_INCLUDE="$(lua_get_CFLAGS)" \
+ LUA_LIB=""
+
+ # Tag the result with current implementation and move it out of the way.
+ mv ${PN}.so ${PN}-${ELUA}.so || die
+}
+
+src_compile() {
+ lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+ # "[ FAILED ] test.lua @ 279: mpack should not leak memory"
+ # It doesn't seem upstream actually support LuaJIT so were this up to me
+ # I would drop it from LUA_COMPAT, unfortunately there are packages in
the
+ # tree which currently expect it to be supported.
+ if [[ ${ELUA} == "luajit" ]]; then
+ ewarn "Not running tests under ${ELUA} because they are known
to fail"
+ return
+ fi
+
+ # The test suite must be able to find the module under its original
name.
+ rm -f ${PN}.so
+ ln -s ${PN}-${ELUA}.so ${PN}.so || die
+ busted --lua="${ELUA}" -o gtest test.lua || die
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ # This time we move the correct library file back in order not to risk
+ # confusing make with symlinks.
+ mv ${PN}-${ELUA}.so ${PN}.so || die
+
+ emake \
+ DESTDIR="${ED}" \
+ USE_SYSTEM_LUA=yes \
+ LUA_CMOD_INSTALLDIR="$(lua_get_cmod_dir)" \
+ install
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+ einstalldocs
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 9946a628585..ef27778a2a2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -527,6 +527,7 @@ dev-lua/luacrypto
>=dev-lua/luv-1.32.0.0-r100
>=dev-lua/mediator_lua-1.1.2_p0-r100
>=dev-lua/messagepack-0.3.2-r100
+>=dev-lua/mpack-1.0.4-r100
>=dev-lua/penlight-1.9.2-r100
>=dev-lua/say-1.3_p1-r100
>=dev-lua/toluapp-1.0.93_p20190513-r100
[gentoo-commits] repo/gentoo:master commit in: dev-lua/ldoc/files/, profiles/, dev-lua/ldoc/
commit: 41195165872cfd58e465582718ca27bcf9f3b6da
Author: Marek Szuba gentoo org>
AuthorDate: Sat Nov 28 19:55:58 2020 +
Commit: Marek Szuba gentoo org>
CommitDate: Sat Nov 28 22:28:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41195165
dev-lua/ldoc: migrate to lua-single.eclass
No point in making this multi-impl regardless of the fact it installs
some Lua modules, from what I can tell LDoc is meant to be always used
as a command-line tool.
Closes: https://bugs.gentoo.org/752897
Signed-off-by: Marek Szuba gentoo.org>
dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch | 21 +++
dev-lua/ldoc/ldoc-1.4.6-r100.ebuild | 35 +
profiles/package.mask | 1 +
3 files changed, 57 insertions(+)
diff --git a/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
new file mode 100644
index 000..08776c560a0
--- /dev/null
+++ b/dev-lua/ldoc/files/ldoc-1.4.6-slotted_lua.patch
@@ -0,0 +1,21 @@
+Do not try to auto-guess Lua directories from the path to the interpreter,
+it does not work with the wrapper set up by lua-single.eclass. Use the
+values of LUA, LUA_BINDIR and LUA_SHAREDIR provided by the ebuild instead.
+
+--- a/makefile
b/makefile
+@@ -1,13 +1,9 @@
+-LUA= $(shell echo `which lua`)
+-LUA_BINDIR= $(shell echo `dirname $(LUA)`)
+-LUA_PREFIX= $(shell echo `dirname $(LUA_BINDIR)`)
+-LUA_SHAREDIR=$(LUA_PREFIX)/share/lua/5.1
+
+ ldoc:
+
+ install: install_parts
+ mkdir -p $(DESTDIR)$(LUA_BINDIR)
+- echo "lua $(LUA_SHAREDIR)/ldoc.lua \$$*" > $(DESTDIR)$(LUA_BINDIR)/ldoc
++ echo "$(LUA) $(LUA_SHAREDIR)/ldoc.lua \$$*" >
$(DESTDIR)$(LUA_BINDIR)/ldoc
+ chmod +x $(DESTDIR)$(LUA_BINDIR)/ldoc
+
+ install_luajit: install_parts
diff --git a/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
new file mode 100644
index 000..5486df73038
--- /dev/null
+++ b/dev-lua/ldoc/ldoc-1.4.6-r100.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single
+
+DESCRIPTION="A LuaDoc-compatible documentation generation system"
+HOMEPAGE="https://stevedonovan.github.io/ldoc/;
+SRC_URI="https://github.com/stevedonovan/LDoc/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="$(lua_gen_cond_dep '
+ dev-lua/penlight[${LUA_USEDEP}]
+')"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.6-mkdir.patch"
+ "${FILESDIR}/${PN}-1.4.6-slotted_lua.patch"
+)
+
+S="${WORKDIR}/LDoc-${PV}"
+RESTRICT="test"
+
+src_install() {
+ emake DESTDIR="${ED}" LUA_BINDIR="${EPREFIX}/usr/bin"
LUA_SHAREDIR="$(lua_get_lmod_dir)" install
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index e2cfd555d13..9946a628585 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -508,6 +508,7 @@ dev-lua/luacrypto
=dev-libs/efl-1.25.1-r10
>=dev-lua/busted-2.0.0-r100
>=dev-lua/dkjson-2.5-r100
+>=dev-lua/ldoc-1.4.6-r100
>=dev-lua/lpeg-1.0.2-r100
>=dev-lua/lua-bit32-5.3.5-r100
>=dev-lua/lua-zlib-1.2-r100
[gentoo-commits] repo/gentoo:master commit in: profiles/, dev-lua/lpeg/
commit: e5aaa5e9720a86fee7a0978772468653d0dec7ae
Author: Conrad Kostecki gentoo org>
AuthorDate: Sat Nov 28 22:23:58 2020 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Nov 28 22:24:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5aaa5e9
dev-lua/lpeg: migrate to lua eclass
Closes: https://bugs.gentoo.org/752612
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Conrad Kostecki gentoo.org>
dev-lua/lpeg/lpeg-1.0.2-r100.ebuild | 77 +
profiles/package.mask | 1 +
2 files changed, 78 insertions(+)
diff --git a/dev-lua/lpeg/lpeg-1.0.2-r100.ebuild
b/dev-lua/lpeg/lpeg-1.0.2-r100.ebuild
new file mode 100644
index 000..a6d27c94e39
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-1.0.2-r100.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} luajit )
+
+inherit lua flag-o-matic toolchain-funcs
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/;
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz;
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "lpeg.html" "lpeg-128.gif" "re.html" )
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.2-makefile.patch" )
+
+src_prepare() {
+ default
+
+ use debug && append-cflags -DLPEG_DEBUG
+}
+
+lua_src_compile() {
+ # Clean project to compile it for every lua slot
+ emake clean
+
+ local myemakeargs=(
+ CC="$(tc-getCC)"
+ LUADIR="$(lua_get_include_dir)"
+ )
+
+ emake "${myemakeargs[@]}"
+
+ # Copy module to match the choosen LUA implementation
+ cp "lpeg.so" "lpeg-${ELUA}.so" || die
+}
+
+src_compile() {
+ lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+ LUA_CPATH="${S}/lpeg-${ELUA}.so" ${ELUA} test.lua || die
+}
+
+src_test() {
+ lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+ # Use correct module for the choosen LUA implementation
+ cp "lpeg-${ELUA}.so" "lpeg.so" || die
+
+ exeinto $(lua_get_cmod_dir)
+ doexe lpeg.so
+
+ insinto $(lua_get_lmod_dir)
+ doins re.lua
+}
+
+src_install() {
+ lua_foreach_impl lua_src_install
+
+ einstalldocs
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index b8ba6285bc4..e2cfd555d13 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -508,6 +508,7 @@ dev-lua/luacrypto
=dev-libs/efl-1.25.1-r10
>=dev-lua/busted-2.0.0-r100
>=dev-lua/dkjson-2.5-r100
+>=dev-lua/lpeg-1.0.2-r100
>=dev-lua/lua-bit32-5.3.5-r100
>=dev-lua/lua-zlib-1.2-r100
>=dev-lua/luadbi-0.7.2-r100
[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQtWebEngine/
commit: 832b7e05450df19d0a8af64f825c29dfa1f7c55f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 28 12:56:48 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 28 21:58:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=832b7e05
dev-python/PyQtWebEngine: Drop 5.14.0 and 5.15.1_pre2006110847
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-python/PyQtWebEngine/Manifest | 2 -
.../PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild | 75 --
.../PyQtWebEngine-5.15.1_pre2006110847.ebuild | 75 --
3 files changed, 152 deletions(-)
diff --git a/dev-python/PyQtWebEngine/Manifest
b/dev-python/PyQtWebEngine/Manifest
index 91fcdaccd5c..300b3bc08a7 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,3 +1 @@
-DIST PyQtWebEngine-5.14.0.tar.gz 47794 BLAKE2B
28f4a577ab5d8c1bea439b11e836008d27b4a49f31f230885013b515147a95c97e398328d1fc3a99619c3fd6eca3da7e94bf5873de9ac6511e0f59e467d4490c
SHA512
c5274ce5ba1c80c6851971c3e18acf33121cd5863f613bd1789fdb40323b52429b55b54f3dcbb3127c85343e11f14c004ad54711b2b59cab95fd440f90fe5f2e
-DIST PyQtWebEngine-5.15.1.dev2006110847.tar.gz 48514 BLAKE2B
a4c4490720dcc1bf95c62e3bb9e72f2e25000a2641b64f2a0466649899f56eac0594461471ba787c332a32cda8b48cff0bddd2d4beceadfca02b1c06668e4117
SHA512
1f39052f22598f4fdb30ce9b9180fc145414e2e6708f2bda5a6f9166824926f91ca61070e64c4d9f880f0711a0c4c3a6a345d9904092bb13d51bd28e71fd52ab
DIST PyQtWebEngine-5.15.1.tar.gz 48520 BLAKE2B
d4e4fcfb1066fcc274f4b3c8ccd7380435b9391586e3396fb5aa95ad7443c168ea9be3b85ec93e2dc28285aca18718afeb1487cb2c4ad5ed1a4f4d03010107ec
SHA512
1efbea43bfd4a6de1c7aa2ab2ca124c4278b6b7ea0d6073c64a7ad83df676759d0747421cae5214017e3c61d8edddf9766f93660e13eee5d407a24fd11d8c21f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
deleted file mode 100644
index 0f869cca536..000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.14.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro;
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz;
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="debug"
-
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
-"
-
-RDEPEND="
- ${PYTHON_DEPS}
-
>=dev-python/PyQt5-5.13.1[gui,network,printsupport,ssl,webchannel,widgets,${PYTHON_USEDEP}]
- >=dev-python/PyQt5-sip-4.19.22:=[${PYTHON_USEDEP}]
- dev-qt/qtcore:5
- dev-qt/qtwebengine:5[widgets]
-"
-DEPEND="${RDEPEND}
- ~dev-python/sip-4.19.22[${PYTHON_USEDEP}]
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- configuration() {
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --qmake="$(qt5_get_bindir)"/qmake
- $(usex debug '--debug --trace' '')
- --verbose
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
-
- # Fix parallel install failure
- sed -i -e '/INSTALLS += distinfo/i distinfo.depends =
install_subtargets install_pep484_stubs install_api' \
- ${PN}.pro || die
-
- # Run eqmake to respect toolchain and build flags
- eqmake5 -recursive ${PN}.pro
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake INSTALL_ROOT="${D}" install
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
-}
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
deleted file mode 100644
index 94183f43f9b..000
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.1_pre2006110847.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-inherit python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for QtWebEngine"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqtwebengine/intro;
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
-
[gentoo-commits] repo/gentoo:master commit in: dev-python/sip/
commit: 38e70cb040252d3b177fee568d6d8e9cefa47670
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 28 12:59:57 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 28 21:58:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e70cb0
dev-python/sip: Drop 4.19.22-r1
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-python/sip/Manifest | 1 -
dev-python/sip/sip-4.19.22-r1.ebuild | 94
2 files changed, 95 deletions(-)
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 22b9d1454a5..9cab9454da6 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,2 +1 @@
-DIST sip-4.19.22.tar.gz 1050805 BLAKE2B
7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc
SHA512
4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
DIST sip-4.19.24.tar.gz 1055461 BLAKE2B
6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575
SHA512
c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
diff --git a/dev-python/sip/sip-4.19.22-r1.ebuild
b/dev-python/sip/sip-4.19.22-r1.ebuild
deleted file mode 100644
index 0990210585d..000
--- a/dev-python/sip/sip-4.19.22-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro;
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz;
-else
-
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz;
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="doc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-4.18-darwin.patch )
-
-src_prepare() {
- # Sub-slot sanity check
- local sub_slot=${SLOT#*/}
- local sip_api_major_nr=$(sed -nre 's:^#define
SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h || die)
- if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
- eerror
- eerror "Ebuild sub-slot (${sub_slot}) does not match
SIP_API_MAJOR_NR (${sip_api_major_nr})"
- eerror "Please update SLOT variable as follows:"
- eerror "SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
- eerror
- die "sub-slot sanity check failed"
- fi
-
- default
-}
-
-src_configure() {
- configuration() {
- local incdir=$(python_get_includedir)
- local myconf=(
- "${PYTHON}"
- "${S}"/configure.py
- --sysroot="${ESYSROOT}/usr"
- --bindir="${EPREFIX}/usr/bin"
- --destdir="$(python_get_sitedir)"
- --incdir="${incdir#${SYSROOT}}"
- AR="$(tc-getAR) cqs"
- CC="$(tc-getCC)"
- CFLAGS="${CFLAGS}"
- CFLAGS_RELEASE=
- CXX="$(tc-getCXX)"
- CXXFLAGS="${CXXFLAGS}"
- CXXFLAGS_RELEASE=
- LINK="$(tc-getCXX)"
- LINK_SHLIB="$(tc-getCXX)"
- LFLAGS="${LDFLAGS}"
- LFLAGS_RELEASE=
- RANLIB=
- STRIP=
- )
- echo "${myconf[@]}"
- "${myconf[@]}" || die
- }
- python_foreach_impl run_in_build_dir configuration
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- installation() {
- emake DESTDIR="${D}" install
- python_optimize
- }
- python_foreach_impl run_in_build_dir installation
-
- einstalldocs
- use doc && dodoc -r doc/html
-}
[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5/
commit: 79b9f7e7c0b4ff9dba0754f9bddce53653efe0f3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 28 12:58:19 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 28 21:58:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b9f7e7
dev-python/PyQt5: Drop 5.14.2-r1 and 5.15.0-r1
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-python/PyQt5/Manifest | 2 -
dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild | 193
dev-python/PyQt5/PyQt5-5.15.0-r1.ebuild | 193
3 files changed, 388 deletions(-)
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index a78c59a5651..954521b840f 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,3 +1 @@
-DIST PyQt5-5.14.2.tar.gz 3246557 BLAKE2B
0dd57da76dede97349c1af1d97cebad430dd5ae03c99b71de2e1ef1c41c1503820b0c0b1af8ddb507ffa5d6f466f7d3012db2cf625dad949dc4c962fb9e8a6a3
SHA512
56d9b2970ff50f2af0bfd889ad1226bf64087a6210cc545c5a0188352d1651343fcda9d53f04b041273f61bf31baf43af4a1854c1b580d50c28cff82f59c24ec
-DIST PyQt5-5.15.0.tar.gz 3262004 BLAKE2B
6f9751bb00a8099555da89cc0df26d36906fabaf12eba60d11479152ad78805ba84d6de9c32b6212a19edb38b10c2253976a964bdcfaf18b8b8aa3656126b73f
SHA512
35bcfef4d7ccfee04c1c4409d2af3d862f1e8e46d6ce743bfcfbaf43d2046bc58317824b0840f3db460ad280d1b7e896812268b36225198e916a1d9ea86823a9
DIST PyQt5-5.15.1.tar.gz 3264559 BLAKE2B
20060297c52aa5d07ba28b50440bd3623b8648eef8502693f8175af9ba4edf9238b9be71c696ea2589556ad70e70e868dc9c286466af22867ab51d5c66e613db
SHA512
a7378dd53337c58f5ba7e9f7510b57fe4affe578b68975ce1dd7ba5c2a1c77d08d51d11078ce782aab09509df934eb3e4d0588de87391f74ad99f9624644cc4e
diff --git a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
b/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
deleted file mode 100644
index 6f47872f089..000
--- a/dev-python/PyQt5/PyQt5-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit multibuild python-r1 qmake-utils
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/intro;
-
-MY_P=${PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz;
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-# TODO: QtNfc, QtRemoteObjects
-IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help
location
- multimedia network networkauth opengl positioning printsupport sensors
serialport
- sql +ssl svg testlib webchannel webkit websockets widgets x11extras
xmlpatterns"
-
-# The requirements below were extracted from configure.py
-# and from the output of 'grep -r "%Import " "${S}"/sip'
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- bluetooth? ( gui )
- declarative? ( gui network )
- designer? ( widgets )
- help? ( gui widgets )
- location? ( positioning )
- multimedia? ( gui network )
- networkauth? ( network )
- opengl? ( gui widgets )
- positioning? ( gui )
- printsupport? ( gui widgets )
- sensors? ( gui )
- serialport? ( gui )
- sql? ( widgets )
- svg? ( gui widgets )
- testlib? ( widgets )
- webchannel? ( network )
- webkit? ( gui network printsupport widgets )
- websockets? ( network )
- widgets? ( gui )
- xmlpatterns? ( network )
-"
-
-# Minimal supported version of Qt.
-QT_PV="5.12:5"
-
-RDEPEND="${PYTHON_DEPS}
- >=dev-python/PyQt5-sip-4.19.20:=[${PYTHON_USEDEP}]
- >=dev-qt/qtcore-${QT_PV}
- >=dev-qt/qtxml-${QT_PV}
- bluetooth? ( >=dev-qt/qtbluetooth-${QT_PV} )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- >=dev-qt/qtdbus-${QT_PV}
- )
- declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- designer? ( >=dev-qt/designer-${QT_PV} )
- gui? ( >=dev-qt/qtgui-${QT_PV}[gles2-only=] )
- help? ( >=dev-qt/qthelp-${QT_PV} )
- location? ( >=dev-qt/qtlocation-${QT_PV} )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
- network? ( >=dev-qt/qtnetwork-${QT_PV}[ssl=] )
- networkauth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
- opengl? ( >=dev-qt/qtopengl-${QT_PV} )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
- printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
- sensors? ( >=dev-qt/qtsensors-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- sql? ( >=dev-qt/qtsql-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- testlib? ( >=dev-qt/qttest-${QT_PV} )
- webchannel? (
[gentoo-commits] repo/gentoo:master commit in: dev-python/PyQt5-sip/
commit: c307ea4040583a8bf598b5841e3139c45bb5103c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 28 12:59:17 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 28 21:58:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c307ea40
dev-python/PyQt5-sip: Drop 4.19.22-r1 and 4.19.23-r1
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-python/PyQt5-sip/Manifest| 2 -
dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild | 90
dev-python/PyQt5-sip/PyQt5-sip-4.19.23-r1.ebuild | 90
3 files changed, 182 deletions(-)
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index 19581414f6a..9cab9454da6 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,3 +1 @@
-DIST sip-4.19.22.tar.gz 1050805 BLAKE2B
7382fdf74c5bb8b55bcedae74acdcb7b81ef06a64d129a9e6f11a5eb293900e37df513f1c4290f2299f49a5bd97e2a6b3c6bc32ddbf2eaf848bd5e5c5dc25edc
SHA512
4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5
-DIST sip-4.19.23.tar.gz 1053640 BLAKE2B
316c972a5cf7dd6464a418702e7d91192202330cf89a78d6ef480034ac8fc2f3f4cfedb85e6bc7d3d018bfe3d29ea767133db008dbfa521312e3aea2b96cff74
SHA512
a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1
DIST sip-4.19.24.tar.gz 1055461 BLAKE2B
6990b127a83fa57bc084eb9a1097f73c384b4fcf3d181479557fe2ffc66cde254bfbb5aef26f5ddd84dca346f54184952e7a111adf3b665f68571853e63b6575
SHA512
c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
b/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
deleted file mode 100644
index 9313ec901ef..000
--- a/dev-python/PyQt5-sip/PyQt5-sip-4.19.22-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="Private sip module for PyQt5"
-HOMEPAGE="https://www.riverbankcomputing.com/software/sip/intro;
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz;
-else
-
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz;
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- !https://www.riverbankcomputing.com/software/sip/intro;
-
-MY_PN=sip
-MY_P=${MY_PN}-${PV/_pre/.dev}
-if [[ ${PV} == *_pre* ]]; then
- SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz;
-else
-
SRC_URI="https://www.riverbankcomputing.com/static/Downloads/${MY_PN}/${PV}/${MY_P}.tar.gz;
-fi
-
-# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h
-SLOT="0/12"
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- !
[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
commit: 9d909a316c62286222879497af56e16b4e138b6b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 28 21:30:43 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 28 21:56:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d909a31
app-office/libreoffice: Use eapi8-dosym
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/libreoffice/libreoffice-7.0.3.1.ebuild | 8
app-office/libreoffice/libreoffice-7.0..ebuild | 10 +-
app-office/libreoffice/libreoffice-.ebuild | 10 +-
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
index 753ef4fb54d..c2fe022a62a 100644
--- a/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.3.1.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == ** ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2
multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic
java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs
xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org;
@@ -637,12 +637,12 @@ EOF
python_optimize "${D}"${lodir}/program
# link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc}
$(python_get_sitedir)/__pycache__/${pyc}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc}
$(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name
${py/.py/*.pyc} -print0)
done
diff --git a/app-office/libreoffice/libreoffice-7.0..ebuild
b/app-office/libreoffice/libreoffice-7.0..ebuild
index 754be8f900f..b9e826f9b40 100644
--- a/app-office/libreoffice/libreoffice-7.0..ebuild
+++ b/app-office/libreoffice/libreoffice-7.0..ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == ** ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2
multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym flag-o-matic
java-pkg-opt-2 multiprocessing python-single-r1 qmake-utils toolchain-funcs
xdg-utils
DESCRIPTION="A full office productivity suite"
HOMEPAGE="https://www.libreoffice.org;
@@ -102,7 +102,7 @@ LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${MY_PV} == ** ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~amd64-linux"
BDEPEND="
dev-util/intltool
@@ -633,12 +633,12 @@ EOF
python_optimize "${D}"${lodir}/program
# link python bridge in site-packages, bug 667802
- local py pyc loprogdir=$(get_libdir)/libreoffice/program
+ local py pyc loprogdir=/usr/$(get_libdir)/libreoffice/program
for py in uno.py unohelper.py officehelper.py; do
- dosym ../../../${loprogdir}/${py} $(python_get_sitedir)/${py}
+ dosym8 -r ${loprogdir}/${py} $(python_get_sitedir)/${py}
while IFS="" read -d $'\0' -r pyc; do
pyc=${pyc//*\/}
- dosym ../../../../${loprogdir}/__pycache__/${pyc}
$(python_get_sitedir)/__pycache__/${pyc}
+ dosym8 -r ${loprogdir}/__pycache__/${pyc}
$(python_get_sitedir)/__pycache__/${pyc}
done < <(find "${D}"${lodir}/program -type f -name
${py/.py/*.pyc} -print0)
done
diff --git a/app-office/libreoffice/libreoffice-.ebuild
b/app-office/libreoffice/libreoffice-.ebuild
index 67f8c3b2d86..500abaa157c 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${MY_PV} == ** ]] && inherit git-r3
-inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2
multiprocessing python-single-r1 qmake-utils toolchain-funcs xdg-utils
+inherit autotools bash-completion-r1 check-reqs eapi8-dosym
[gentoo-commits] repo/gentoo:master commit in: media-libs/shaderc/, media-libs/shaderc/files/
commit: e7ef1eb448ee00078898167b5f68dec3ea7b3700
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Nov 28 21:20:22 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Nov 28 21:56:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ef1eb4
media-libs/shaderc: Drop 2018* 2019* and 2020.1
Bug: https://bugs.gentoo.org/751007
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/shaderc/Manifest| 3 -
.../shaderc-2018.0-fix-glslang-link-order.patch| 26 ---
...derc-2019.0-fix-build-against-new-glslang.patch | 54 --
.../shaderc-2019.0-fix-glslang-link-order.patch| 26 ---
media-libs/shaderc/shaderc-2018.0.ebuild | 85 -
media-libs/shaderc/shaderc-2019.0-r1.ebuild| 86 -
media-libs/shaderc/shaderc-2020.1.ebuild | 87 --
7 files changed, 367 deletions(-)
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index ab03783825f..2aa1ccceae8 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,5 +1,2 @@
-DIST shaderc-2018.0.tar.gz 206013 BLAKE2B
b45fb6e959f621566817f8e31b1947e479b6ea392eb64f334dca9ad24cc4e8b736dd236e634de3f96342f48d8138722a2b769efb9db65025def5ed59bf5b911b
SHA512
7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-DIST shaderc-2019.0.tar.gz 232620 BLAKE2B
53fd0967fe22e5a89783fccb485dc07c31a18eb328c6cf7244349714c6774d1877c1fbae0b8ffcf47d189f1e0c5f2d501f027ff3aa05bdd59950d49a4084e9b5
SHA512
c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-DIST shaderc-2020.1.tar.gz 276137 BLAKE2B
06466db46b244001c36523ccf218b0485a46864465eda4c605889f65e3acbbbae9f1f7e30c183352f39fb09b1d2b2e87bde26092f1c415de3c55f9d5dde839d2
SHA512
3f53b0be4a15b5b3da0778f2275c7f69579482ee8253b77b4127c4db13a94fbf1e39b3daabafc8642b2d3351acdceed45996af6cbfe310cfaa6cea3a666d828e
DIST shaderc-2020.2.tar.gz 278161 BLAKE2B
8c8eaf610eb4b6ee44ecf2535eaefe6cca6b39e084293981f1ba50677d8e9d0ee5a88371ccb94696746c830246fac7b48d25568971ee40e504cc4aef57f69320
SHA512
1316445d3310db75b3513ef9cd3012485d945c4b775c29b74d29bb7b7ccad9b2c80dcb4a904eaa6854a3273c569349b186bed8dcc70bc33d6caacfd4c0e12d97
DIST shaderc-2020.4_pre20201106.tar.gz 220189 BLAKE2B
5add12ddc2013c797b96a65bf531ea7f2a05812fb6cccf0d7d2e5bbaab0d6da78086de7d3a4cce1be936aa683524a9306f97e9d825b2fac7ea660fe7e5ee6a3f
SHA512
99433df499213eb5c625a54994278567863fa402cbdac78ca06b635c488284e59308a6ce79ecd07e55b256431206fe7e26171de39a2508feb32dd85bb7bbcfe2
diff --git
a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
b/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
deleted file mode 100644
index 837303d84e1..000
--- a/media-libs/shaderc/files/shaderc-2018.0-fix-glslang-link-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
-- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
-
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..b189430 100644
a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -35,7 +35,7 @@ endif(SHADERC_ENABLE_INSTALL)
- find_package(Threads)
- target_link_libraries(shaderc_util PRIVATE
- glslang OSDependent OGLCompiler HLSL glslang SPIRV
-- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
-
- shaderc_add_tests(
- TEST_PREFIX shaderc_util
diff --git
a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
b/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf62a..000
---
a/media-libs/shaderc/files/shaderc-2019.0-fix-build-against-new-glslang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
-index 3c3c3de..b5fc6cb 100644
a/libshaderc/src/shaderc.cc
-+++ b/libshaderc/src/shaderc.cc
-@@ -20,7 +20,7 @@
- #include
- #include
-
--#include "SPIRV/spirv.hpp"
-+#include "glslang/SPIRV/spirv.hpp"
-
- #include "libshaderc_util/compiler.h"
- #include "libshaderc_util/counting_includer.h"
-diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
-index
[gentoo-commits] repo/gentoo:master commit in: dev-lang/jsonnet/
commit: 81041b3c67c62a14f29deb71cfc3f40aeff242fb
Author: Patrick McLean gentoo org>
AuthorDate: Sat Nov 28 21:42:47 2020 +
Commit: Patrick McLean gentoo org>
CommitDate: Sat Nov 28 21:43:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81041b3c
dev-lang/jsonnet-0.17.0-r1: Fix regressions in last bump (bug #757312)
Made a mistake and started from the wrong ebuild when bumping.
Closes: https://bugs.gentoo.org/757312
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Patrick McLean gentoo.org>
...nnet-0.17.0.ebuild => jsonnet-0.17.0-r1.ebuild} | 27 ++
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/dev-lang/jsonnet/jsonnet-0.17.0.ebuild
b/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
similarity index 73%
rename from dev-lang/jsonnet/jsonnet-0.17.0.ebuild
rename to dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
index 67acab8..3faabad2b33 100644
--- a/dev-lang/jsonnet/jsonnet-0.17.0.ebuild
+++ b/dev-lang/jsonnet/jsonnet-0.17.0-r1.ebuild
@@ -4,14 +4,14 @@
EAPI=7
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
inherit toolchain-funcs flag-o-matic distutils-r1
DESCRIPTION="A data templating language for app and tool developers "
HOMEPAGE="https://jsonnet.org/;
SRC_URI="https://github.com/google/jsonnet/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-IUSE="custom-optimization python"
+IUSE="custom-optimization doc examples python"
LICENSE="Apache-2.0"
SLOT="0"
@@ -34,6 +34,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}/jsonnet-0.14.0-makefile.patch"
"${FILESDIR}/jsonnet-0.12.1-dont-call-make-from-setuppy.patch"
+ "${FILESDIR}/jsonnet-0.16.0-libdir.patch"
+ "${FILESDIR}/jsonnet-0.16.0-cp-var.patch"
)
distutils_enable_tests unittest
@@ -45,15 +47,12 @@ src_prepare() {
src_configure() {
use custom-optimization || replace-flags '-O*' -O3
+ tc-export CC CXX
default
}
src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
- jsonnet \
- libjsonnet.so \
- libjsonnet++.so
-
+ emake bins libs
use python && distutils-r1_src_compile
}
@@ -68,8 +67,16 @@ python_test() {
}
src_install() {
- dolib.so libjsonnet*.so
- dobin jsonnet
-
+ emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" \
+ CP="cp -d" LIBDIR="$(get_libdir)" install
use python && distutils-r1_src_install
+ if use doc; then
+ find doc -name '.gitignore' -delete || die
+ docinto html
+ dodoc -r doc/.
+ fi
+ if use examples; then
+ docinto examples
+ dodoc -r examples/.
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-docs/
commit: e8792bca69bbf54353a0cf35d8679eb232c62709
Author: Michał Górny gentoo org>
AuthorDate: Sat Nov 28 20:05:31 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Nov 28 21:40:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8792bca
dev-python/python-docs: Mark 3.8.6 stable
Signed-off-by: Michał Górny gentoo.org>
dev-python/python-docs/python-docs-3.8.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/python-docs/python-docs-3.8.6.ebuild
b/dev-python/python-docs/python-docs-3.8.6.ebuild
index 16f1d2327d6..2804f868635 100644
--- a/dev-python/python-docs/python-docs-3.8.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
LICENSE="PSF-2"
SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc
x86"
src_install() {
rm -r _sources || die
[gentoo-commits] repo/gentoo:master commit in: dev-python/python-docs/
commit: f84bc809b4128928bd4717456f573c8f90fdc75e
Author: Michał Górny gentoo org>
AuthorDate: Sat Nov 28 20:05:38 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Nov 28 21:40:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84bc809
dev-python/python-docs: Remove old
Signed-off-by: Michał Górny gentoo.org>
dev-python/python-docs/Manifest | 1 -
dev-python/python-docs/python-docs-3.8.5.ebuild | 23 ---
2 files changed, 24 deletions(-)
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index e587f6498fb..5ba8afa1198 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,6 +1,5 @@
DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B
c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d
SHA512
db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B
dc1c9f702bdd8be619c3cd6fd0f8cab022b8d7542ace7a7b7f63b9642f693c63b036f03248cf7ea0108ab7e33655379ca906c8ef7c35d8242517ead721a83778
SHA512
da28da84f5e8f889f328fafb4d17beb6cfc52c5703bcf5080cfbaea552f414d6f0a682aaacb2f04fa32e9453a1bdaae8ff108c38a4486170bd0edf1efacafdf7
DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B
bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a
SHA512
243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
-DIST python-3.8.5-docs-html.tar.bz2 6562020 BLAKE2B
29a375c0b0be6bedc7d52c15e038b1d150940a0b6185490bdacbce5822c6e88c49124a293a85ea2c08642fcdb99625986ec26ca1d712184988e02729f35e17aa
SHA512
db9cc21223bc3b3126140e30c7731152816c61fdb647787c64e138ec882838dbc69fce8a4012ba389bc8efebdb2e0efb5e1b0a6cd652a8b9ad20bb021b277de7
DIST python-3.8.6-docs-html.tar.bz2 6578280 BLAKE2B
efdc62b2d570cbe7e69be1cf118250ee89f1b09af7e7db306970e764dcc9e6f20bda9230fe934ecc0891a1d79370294bc42170713b9471d05f23a468f09015fc
SHA512
be0d61a9556fbdd24ab124cfdf220b3bdb537cc02d5896f8f4c75cb73e3cfd5c2947c060d049b57bf5576b4b2d1c7f0f3987070d70ce883dea023e1feab1a630
DIST python-3.9.0-docs-html.tar.bz2 6771373 BLAKE2B
301b8687043277a3d11dc497985769efdeaf33f8af2fc3d52b8a0b50322851402c1a1b273e782db6bd7ac51bbd94f7345c0995d0dd4f4d37bce10351620c6f6e
SHA512
d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
diff --git a/dev-python/python-docs/python-docs-3.8.5.ebuild
b/dev-python/python-docs/python-docs-3.8.5.ebuild
deleted file mode 100644
index 2804f868635..000
--- a/dev-python/python-docs/python-docs-3.8.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/;
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2;
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc
x86"
-
-src_install() {
- rm -r _sources || die
- docinto html
- dodoc -r .
-
- newenvd - 60python-docs-${SLOT} <<-EOF
-
PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
- EOF
-}
[gentoo-commits] repo/proj/guru:dev commit in: dev-vcs/gitahead/
commit: 8bcb90c2a8aa2a31b16b22cad370fb31dd7e404d
Author: Maciej Barć protonmail com>
AuthorDate: Sat Nov 28 17:35:23 2020 +
Commit: Maciej Barć protonmail com>
CommitDate: Sat Nov 28 17:35:23 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8bcb90c2
dev-vcs/gitahead: new pkg; add version 2.6.3
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Maciej Barć protonmail.com>
dev-vcs/gitahead/Manifest | 6 +++
dev-vcs/gitahead/gitahead-2.6.3.ebuild | 90 ++
dev-vcs/gitahead/metadata.xml | 14 ++
3 files changed, 110 insertions(+)
diff --git a/dev-vcs/gitahead/Manifest b/dev-vcs/gitahead/Manifest
new file mode 100644
index ..f5431ce0
--- /dev/null
+++ b/dev-vcs/gitahead/Manifest
@@ -0,0 +1,6 @@
+DIST gitahead-2.6.3-dep_cmark_cmark.tar.gz 231023 BLAKE2B
b3e5768c04d33a6273befa8f1aa121b1f4df7ab1c4791c093681186b74b9a819824ff7d6369b456fe94e121344eecd704e71657d8004b1ef66b54ec4cb2a6abd
SHA512
65fe291cfc9d163dff8ae69f98cb3449434405a50835056d2bf4aff43131f23d7d837c4ec7aa9bec93df184ff5d1210bff522d702fbddc96844dcf98f515d0b7
+DIST gitahead-2.6.3-dep_git_git.tar.gz 7968616 BLAKE2B
7d2ea9e1ca1faa1a8b66a9db6b213c02be966cec74abe085139e3e966adcff9efbd74fb942ad145ddea64bab94a6006b91b512c96aa645cb124bcaf6e5a488eb
SHA512
37a77870e0df748b023f5381aa969f1126b142a3470c9df4e01d86cf3418a0b0e4cb16a37ef7b162f285bdd540559a3511488ec8591b2f88e495626df019c03f
+DIST gitahead-2.6.3-dep_libgit2_libgit2.tar.gz 5322459 BLAKE2B
2a5a4e98e3d6f2883f60604ea5721a56fbc9f3c2403686cda5b65e3fe859bbbe773d30d7fbf8a9d1549aeeda3367526d8604047a27cde490edc8f3fb982fa0c6
SHA512
068be7000e8c9f01073ffa315e398b687e937fbd63fb77021a307cfefc8382ddb085a36f6a2b40bade355d6ffcb1772de8551b9eb6f9eb56877805883804114d
+DIST gitahead-2.6.3-dep_libssh2_libssh2.tar.gz 464738 BLAKE2B
6520c4df6584798505da8e14bfb4fe43389d0b3702d7eee6ce6b604d3260df7fda5c79cef8f69614035efeb31e516da63464313e11f64b6e8995a39c814683e8
SHA512
e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231
+DIST gitahead-2.6.3-dep_openssl_openssl.tar.gz 11271304 BLAKE2B
35ed131c683d4bb343ca5891553eef3c6079a90b475d54e1d68917b7fb3d88e34880c8f222d2f2633e2ed4eb52c3b2ca57def4d48e16693e2e76915dd0f4
SHA512
98c0491ea2051120cbb369ac1e069028d21746d70a3a9cb5553ea27d52ab2e68353390c89e9c0202cea2fcd0b1a39cc070e29119b322aedd3d58e014626f6f05
+DIST gitahead-2.6.3.tar.gz 34528473 BLAKE2B
e35a055e62dab67d7a6efd0e9783ff485d3208b85e8e799f722d1346f55b1cdd1c7983631aab1766d2d64577e3ba37350fa89713f25562273c52ecfca43029d8
SHA512
8d64efc156343a9c04d12c8a41742e36aed39260d0040ec1a52ce567a73e156f1ce77c61672cb93ef30c0b6c7ee48d9a6e94381ce7034142cdcf2f60a839c712
diff --git a/dev-vcs/gitahead/gitahead-2.6.3.ebuild
b/dev-vcs/gitahead/gitahead-2.6.3.ebuild
new file mode 100644
index ..76c021d0
--- /dev/null
+++ b/dev-vcs/gitahead/gitahead-2.6.3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg wrapper
+
+DESCRIPTION="Graphical Git client to help understand and manage source code
history"
+HOMEPAGE="https://github.com/gitahead/gitahead;
+SRC_URI="
+ https://github.com/gitahead/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+
https://github.com/openssl/openssl/archive/d1c28d791a7391a8dc101713cd8646df96491d03.tar.gz
-> ${P}-dep_openssl_openssl.tar.gz
+
https://github.com/stinb/libgit2/archive/90af68bbe2690998f015f18b7c890f5868bcd3ee.tar.gz
-> ${P}-dep_libgit2_libgit2.tar.gz
+
https://github.com/libssh2/libssh2/archive/42d37aa63129a1b2644bf6495198923534322d64.tar.gz
-> ${P}-dep_libssh2_libssh2.tar.gz
+
https://github.com/git/git/archive/0d0ac3826a3bbb9247e39e12623bbcfdd722f24c.tar.gz
-> ${P}-dep_git_git.tar.gz
+
https://github.com/commonmark/cmark/archive/f0793895eefc8ca14499831a24abee549a5af53e.tar.gz
-> ${P}-dep_cmark_cmark.tar.gz
+"
+
+RESTRICT="test"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+
+ cd "${S}" || die
+ local i list=(
+ dep_openssl_openssl
+ dep_libgit2_libgit2
+ dep_libssh2_libssh2
+ dep_git_git
+ dep_cmark_cmark
+ )
+ for i in "${list[@]}"; do
+ [ ! -f "${DISTDIR}/${P}-${i}.tar.gz" ] && die "The file
${DISTDIR}/${P}-${i}.tar.gz doesn't exist"
+ tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C
"${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
+ done
+}
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+
[gentoo-commits] proj/portage: New tag: portage-3.0.11
commit: Commit: Zac Medico gentoo org> CommitDate: Sat Nov 28 21:17:58 2020 + New tag: portage-3.0.11
[gentoo-commits] proj/portage:master commit in: /
commit: 27d44788626684cf9973f6e175ebf3d4946fd8d2 Author: Zac Medico gentoo org> AuthorDate: Sat Nov 28 21:03:29 2020 + Commit: Zac Medico gentoo org> CommitDate: Sat Nov 28 21:03:41 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=27d44788 Updates for portage-3.0.11 release Signed-off-by: Zac Medico gentoo.org> RELEASE-NOTES | 6 ++ setup.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 61c3c3d16..7fff83017 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,6 +1,12 @@ Release Notes; upgrade information mainly. Features/major bugfixes are listed in NEWS +portage-3.0.11 +== +* Bug Fixes: +- Bug 756961 handle dev-lang/rust[system-bootstrap] dependency cycle +- Bug 757306 backtracking: fix virtual choices for circular deps + portage-3.0.10 == * Bug Fixes: diff --git a/setup.py b/setup.py index 443b94422..95a53307d 100755 --- a/setup.py +++ b/setup.py @@ -655,7 +655,7 @@ class build_ext(_build_ext): setup( name = 'portage', - version = '3.0.10', + version = '3.0.11', url = 'https://wiki.gentoo.org/wiki/Project:Portage', author = 'Gentoo Portage Development Team', author_email = 'dev-port...@gentoo.org',
[gentoo-commits] repo/proj/guru:dev commit in: app-misc/navi/
commit: c202eff28b014ed141ee466da38d0fc6a795afac
Author: Matthias Coppens gmail com>
AuthorDate: Sat Nov 28 21:16:35 2020 +
Commit: Matthias Coppens gmail com>
CommitDate: Sat Nov 28 21:16:45 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c202eff2
app-misc/navi: Version bump 2.13.0
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Matthias Coppens gmail.com>
app-misc/navi/Manifest | 11 ++-
app-misc/navi/{navi-2.12.0.ebuild => navi-2.13.0.ebuild} | 9 +
app-misc/navi/navi-.ebuild | 9 +
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/app-misc/navi/Manifest b/app-misc/navi/Manifest
index f65a1cc8..e0edcf44 100644
--- a/app-misc/navi/Manifest
+++ b/app-misc/navi/Manifest
@@ -15,27 +15,34 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B
3cb287c7741c4d5b0551331634a75b066
DIST derive_more-0.14.1.crate 17165 BLAKE2B
b7c90d96fa74dbbd5af6f82ab0bece3841bf5f7e08bf7622cd0e32a22ddf1f25f8b48f42a1387eb18a00e7816d876a445357eb594011eedc1b15cddab018c42e
SHA512
703951b04d07f90225b08f3688c2afa1d78511c82433d4430827592c5c5cab3b442c914420c533e91c929caad02044586d3f81a6e74bc32c12b9d75b2345e13e
DIST directories-next-1.0.1.crate 14782 BLAKE2B
929cd266f6bc24923b51c4dd601cd29345e0c13b06b0d87644aa3af3ab059ba1ae2f6948a98541f77268d8b435a3581d36074b8c5b31b8a9729e88cf68d8e243
SHA512
577d715b61e4ef54b7fae7e3d5643800c3468134d68fa392333e64af6b57af8aaa50c161257659f9f4bedd0cc6d5b600f026ee6222edf661b2cfa37c59c765aa
DIST dirs-sys-next-0.1.0.crate 10515 BLAKE2B
2be245c34e0392af0f1019ee170471f87c3ea470914861d2bebe5b4873238537c38718478d2a1e0a9bd27f9658baba9a526894a53336fb04df830f11aa7d1e41
SHA512
1a812ad74d4e7c232adcf9ca640234226f455061f90502e3f7b5a3a74dd48b761f04112fe898bae3d643711daceabbe5ec8b197661e6c39b20e9e54ad6562db8
+DIST edit-0.1.2.crate 8332 BLAKE2B
1ec6bac54ca98901f6c2da51e11ca12924bdfd3add6ebf59e7854a9b5064561f7840aaf26bea6e057348f539b6f451c04bbf6f41aeaeec57adbab388618d5116
SHA512
e33bf16fa36532a0601c35ebf3988ceec97fa8d5b4d1a629d7e2b0104dcefc05a02a932e94d8be6f314713833cf4b1396de7858efaeb987ddcf7dd6809e908d5
DIST getrandom-0.1.15.crate 24786 BLAKE2B
868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595
SHA512
b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
DIST heck-0.3.1.crate 54666 BLAKE2B
99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07
SHA512
134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
DIST hermit-abi-0.1.15.crate 9597 BLAKE2B
012fdcd6ed09e4bfc9256d524648b0e7f65e9bc8dc6351d04249c492a0b5e836c529791f79fd144b9f09ae55462c034b9a3fbcff5b2abb40a7c78f7f8d78f64a
SHA512
f81f6a87e0a182b5e49a2edf60f47243b7cbb116df5aa6a3354f1e230d4030bb5697ad4eb9abb6203ff66c1cfac1fc35b7d7e76dedc276767124ea4f41f97535
DIST lazy_static-1.4.0.crate 10443 BLAKE2B
25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23
SHA512
e124c0521ec7c950f3c4a066821918da7a9c6e75d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST libc-0.2.77.crate 507233 BLAKE2B
f02ee13e41dfa6317a6cf7f0724f891cc9f98a68cd25e865e744ebbe49d93c86f16c2fd71ef4410ff28e0b386c5b4dff605c1236db83bdb91292ae48d0900782
SHA512
1e6dbd6f646a50fffd294ea56146c42dec6c4e027f2cd886ce2bbab9a5a2d036e4787f95201c448bef9ceddd52d863153c849343791d92900bf1378fbacee0f7
DIST memchr-2.3.3.crate 22566 BLAKE2B
f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5
SHA512
922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
-DIST navi-2.12.0.tar.gz 53355 BLAKE2B
320347861bd3387df72bfed7043eb97f365eabbaf497c41fb5ca7728b526539356d42be9fcac830155e240088736877c127911fbffd95e04692c09448de5c63e
SHA512
f2eff537ff6232b5dc6b7fd7e282d3d006e038ed85387ea50da426523571c3ef43bad23fb103e4ce7556eeb4783cbc7e2ec07d5cc28e7a8ace423a44215cfd4c
DIST navi-2.12.1.tar.gz 54146 BLAKE2B
828bddec30680ac7b9c7cb4dd6cccbbd3c7fe1240f81fd3391463d5f7d1bdc7f2f6e4a805908c53a12a75f8ebe40a450693f8844b88108e9e1af96c05c3e8b0d
SHA512
032b0aa6e293dda3bd6ef44294074676ff6d7fe40972ae644b603c67aac9eb976c47637f3029afffb7d497b7c5f7c5fd89aacc9eaca47228acb124f0abab
+DIST navi-2.13.0.tar.gz 55791 BLAKE2B
5b0f281c5ee35091e773bb7186213403203702b3087910e26cedc67f38e7010711426812f227b63c9e6cfd40c853a362e5f096a0c2de3806ec00c2f6b006b1ed
SHA512
5f8dbc7fb5246283e595a0463b1e98ed17df8bb2c5de474998422a4bac3feca9c221c0ba856c0f1638af612c381a8296d2fb4cf95bce987122855e9c9b1db03d
DIST
[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/
commit: d77f07243dac0d12e44d0b0c5e6ab79c76111809
Author: Zac Medico gentoo org>
AuthorDate: Sat Nov 28 21:10:27 2020 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Nov 28 21:17:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77f0724
sys-apps/portage: Bump to version 3.0.11
#756961 handle dev-lang/rust[system-bootstrap] dependency cycle
#757306 backtracking: fix virtual choices for circular deps
Bug: https://bugs.gentoo.org/756793
Bug: https://bugs.gentoo.org/756961
Bug: https://bugs.gentoo.org/757306
Bug: https://bugs.gentoo.org/756028
Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Zac Medico gentoo.org>
sys-apps/portage/Manifest | 1 +
sys-apps/portage/portage-3.0.11.ebuild | 267 +
2 files changed, 268 insertions(+)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 37d756e3aaa..9d2dc418afb 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,6 +1,7 @@
DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B
7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f
SHA512
6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B
dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8
SHA512
176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B
9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77
SHA512
d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
+DIST portage-3.0.11.tar.bz2 1048734 BLAKE2B
d52e6d90750da0a2474e7b0071955111382aaf14d0c464bd66e673fc953ee90c2a426bd2e05b3642339483184a390ba416b2024849779d0fd95172d383ad4851
SHA512
048f7df9f2748565b8cc258667d1ea8fe0cd5e2dbea58d70ce9670885ba00949c16f9c5e7d2c3b2f795fd8f1d977792a9cb083613376128d33bdf9c1e1e4a8e9
DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B
6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0
SHA512
7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B
662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666
SHA512
5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B
44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd
SHA512
01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618
diff --git a/sys-apps/portage/portage-3.0.11.ebuild
b/sys-apps/portage/portage-3.0.11.ebuild
new file mode 100644
index 000..28cd3d04cca
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.11.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info tmpfiles prefix
+
+DESCRIPTION="Portage is the package management and distribution system for
Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage;
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify
selinux test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-vcs/git )"
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ apidoc? (
+ dev-python/sphinx
+ dev-python/sphinx-epytext
+ )"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+ app-arch/zstd
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/findutils-4.4
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+
