[gentoo-commits] repo/gentoo:master commit in: app-text/evince/
commit: 77fc1d929b72e5e6cc6c015913dfa7bc41da364b
Author: Matt Turner gentoo org>
AuthorDate: Thu Jun 10 04:30:19 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jun 10 04:31:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fc1d92
app-text/evince: Version bump to 40.2
Signed-off-by: Matt Turner gentoo.org>
app-text/evince/Manifest | 1 +
app-text/evince/evince-40.2.ebuild | 127 +
2 files changed, 128 insertions(+)
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 1095fa07537..282896ed83b 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1 +1,2 @@
DIST evince-40.1.tar.xz 2928924 BLAKE2B
e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc
SHA512
c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
+DIST evince-40.2.tar.xz 2928072 BLAKE2B
86051e8568044ec484a7a3c036a523ee44d22e46bdf5e75c6052d3302f92a27d48cb26e2408b176cfee3fafd3879a8771f4bf29a51f6b8085c31fa28f4885660
SHA512
f3ee19053a0bc6989a50fc790d1d54747d7aac5cbf0cd1e0eaea6cb743c0ebbbdf2565e88ea995fbba31c7f97e4279f9c0fa44c386bcf635a500033f6105ca9f
diff --git a/app-text/evince/evince-40.2.ebuild
b/app-text/evince/evince-40.2.ebuild
new file mode 100644
index 000..f3d4f7e417e
--- /dev/null
+++ b/app-text/evince/evince-40.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince;
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection
nautilus nsplugin postscript spell t1lib tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.44.0:2
+ >=gui-libs/libhandy-1.0:1=
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib:=
+ >=x11-libs/gdk-pixbuf-2.40:2
+ >=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+ gnome-base/gsettings-desktop-schemas
+ >=x11-libs/cairo-1.10:=
+ >=app-text/poppler-0.76.0[cairo]
+ >=app-arch/libarchive-3.2.0
+ djvu? ( >=app-text/djvu-3.5.22:= )
+ dvi? (
+ >=app-text/libspectre-0.2:=
+ dev-libs/kpathsea:=
+ t1lib? ( >=media-libs/t1lib-5:= ) )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0 )
+ gnome? ( gnome-base/gnome-desktop:3= )
+ gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+ introspection? ( >=dev-libs/gobject-introspection-1:= )
+ nautilus? ( >=gnome-base/nautilus-3.28.0 )
+ postscript? ( >=app-text/libspectre-0.2:= )
+ spell? ( >=app-text/gspell-1.6.0:= )
+ tiff? ( >=media-libs/tiff-3.6:0= )
+ xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+ gnome-base/gvfs
+ gnome-base/librsvg
+ || (
+ >=x11-themes/adwaita-icon-theme-2.17.1
+ >=x11-themes/hicolor-icon-theme-0.10
+ )
+"
+BDEPEND="
+ gtk-doc? ( >=dev-util/gtk-doc-1.33 )
+ app-text/docbook-xml-dtd:4.3
+ dev-libs/appstream-glib
+ dev-util/gdbus-codegen
+ dev-util/glib-utils
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/40.0-internal-synctex.patch
+)
+
+src_prepare() {
+ default
+
+ # Do not depend on adwaita-icon-theme, bug #326855, #391859
+ # https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+ sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dplatform=gnome
+
+ -Dviewer=true
+ -Dpreviewer=true
+ -Dthumbnailer=true
+ $(meson_use nsplugin browser_plugin)
+ $(meson_use nautilus)
+
+ -Dcomics=enabled
+ $(meson_feature djvu)
+ $(meson_feature dvi)
+ -Dpdf=enabled
+ $(meson_feature postscript ps)
+ $(meson_feature tiff)
+ $(meson_feature xps)
+
+ $(meson_use gtk-doc gtk_doc)
+ -Duser_doc=true
+ $(meson_use introspection)
+ -Ddbus=true
+ $(meson_feature gnome-keyring keyring)
+ $(meson_feature cups gtk_unix_print)
+ $(meson_feature gnome
[gentoo-commits] repo/gentoo:master commit in: profiles/arch/powerpc/ppc64/64le/
commit: 5e12b01c2aa27a91796678e77796be940722447a Author: Georgy Yakovlev gentoo org> AuthorDate: Thu Jun 10 04:13:20 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Thu Jun 10 04:16:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e12b01c profiles/arch/powerpc/ppc64/64le: sync clang masks with be Signed-off-by: Georgy Yakovlev gentoo.org> profiles/arch/powerpc/ppc64/64le/package.use.mask | 9 + profiles/arch/powerpc/ppc64/64le/use.mask | 4 2 files changed, 13 insertions(+) diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask index b2593cab722..44e499bb6fe 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.use.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask @@ -5,6 +5,10 @@ # altivec code is big-endian only, #773100 media-libs/libdvbcsa cpu_flags_ppc_altivec +# Michał Górny (2021-03-06) +# LLVM 9 has been removed. +dev-util/perf clang + # Michał Górny (2020-12-21) # Additional sanitizers supported on ppc64le. sys-libs/compiler-rt-sanitizers -xray @@ -22,6 +26,11 @@ app-emulation/crun -criu dev-java/openjdk:8 -javafx dev-java/openjdk:11 -javafx +# Georgy Yakovlev (2020-05-03) +# Fails to build, needs more work +www-client/firefox clang +mail-client/thunderbird clang + # Georgy Yakovlev (2020-02-26) # vulkan tested and works on ppc64le dev-qt/qtdeclarative -vulkan diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask index e0ecc03fcaf..208423630f7 100644 --- a/profiles/arch/powerpc/ppc64/64le/use.mask +++ b/profiles/arch/powerpc/ppc64/64le/use.mask @@ -9,6 +9,10 @@ # dev-qt/qtwebengine works on ppc64le -webengine +# Georgy Yakovlev (2020-06-03) +# clang is keyworded and works on ppc64 +-clang + # Georgy Yakovlev
[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/
commit: 0166f9b1f4a394fe6f961e2888b06726c79ef7cb
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 04:08:10 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 04:08:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0166f9b1
net-vpn/tor: drop 0.4.6.3_rc
Signed-off-by: Sam James gentoo.org>
net-vpn/tor/Manifest | 2 -
net-vpn/tor/tor-0.4.6.3_rc.ebuild | 108 --
2 files changed, 110 deletions(-)
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index d2ec7c52d00..85da6d1ff53 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -4,7 +4,5 @@ DIST tor-0.4.5.7.tar.gz 7816158 BLAKE2B
839a81b237e29f12ace8be518d6aed87dce8cc16
DIST tor-0.4.5.7.tar.gz.asc 833 BLAKE2B
ede473bd1083acf96c05a1469651a89bc38147f8cb82eaaa4bf2eea8731b1a7a05ccf7d26c59bda51cb46e3a9e762c93a813d05a9e07f24b6d8edb65c4a4e079
SHA512
f41009b3683584a2a6df2609f2bd6b134d5cd02547f53a60aa18a847f3aa8e9a1b0edbd45a52930ba15b19e48c7d6d80a94f8be69a3e4b4e1c39acc810cfacee
DIST tor-0.4.5.8.tar.gz 7826458 BLAKE2B
f81f690922ce2e46083706dcf8173720e95274878c17e2b2754d347cdfb4324d2c3ac50c787b501b37e00dc8387a7d6d44dc2d4e85b7afeb61964fbcdcf4d7b1
SHA512
f5cb32f5d0fc333aa1607370e290e6be85230896bd26e00072a68db4b32293d5dd38cccb57e92941fbe6ac17fb4207c38d11e3095ede289c3a6ebbd64ed70119
DIST tor-0.4.5.8.tar.gz.asc 833 BLAKE2B
80be1b4981771c797b15cf695299c32e68acc4fd5e880d794479956fa75604088cd26f7e99e1a11e10290786b00ffa40f099ac11b9a75d6bd557ed30caf3d605
SHA512
3fd05701f908434eed13970abe989182b9b6af0e4824d1d258a74ce29230a928b06d88d5c398d7031d71048fbeb46185a9d76d8a5d239ee3c58cf41f90ae08c7
-DIST tor-0.4.6.3-rc.tar.gz 7734759 BLAKE2B
13f96813db9aa77416b0c5a9031b84ea4a42ebd1d4c6b2740f009bbf10fea3f49591a307fa8992007d6b92413d755875d74d478e8192284f32e692f448180bc3
SHA512
0d9d400e0d61a15ef801b430e0acb7eee369fdd62b78e450759d2fa08363e78bd2a301ce87796a37ab8630ce4669021b5100dedc1ffb983159893b1769d01a61
-DIST tor-0.4.6.3-rc.tar.gz.asc 833 BLAKE2B
15b614758f719916ba38a1a70f99aff3d14d8b38105963edf708987dc383d9157024b1dfbf7e248a6275bab33cc1a8d599a14a08e29d4d9986b9b0ffbd3e93d6
SHA512
1fc31fd4cd4c1d40e25797b0bdf2408bc81ea664e31ec21961b81f25d13b4ddbe7e6db9a50c52e6f5492d7177817e753d7bd3383ac6486e6f8d6c01bdbb2ce8c
DIST tor-0.4.6.4-rc.tar.gz 7735733 BLAKE2B
904de2a8993ba9d767103c9d8df1d8b43e9146fd117998d356a9db5e2b922537829baf4c316cc4a5d369ab3cf3c53c9536289358148d664cd6e06a66182cb839
SHA512
87deaa1f7b9cb2d1a5c75db18f95bfa85b3974f407188b436fe71f82467c2bc9e072e81da386be1ae9c2e07459684fb97705dd72089efaee853cf926c19082a3
DIST tor-0.4.6.4-rc.tar.gz.asc 833 BLAKE2B
a4b99eea521809d99f401730da7a666b327d00860908d7c5d66777dd55379d67428f1b430aa1f36065d606c5e32bc897e2fb05b28043736f6d05bbab118e328c
SHA512
500fdaa70ddc0fdb06f6f508a8cfdd28253c6997966925ad1f748a8dcbd20325691fac63ea434997ccf12a7c117d6d4f8e4fda37331ea727afb503b3dfc75db8
diff --git a/net-vpn/tor/tor-0.4.6.3_rc.ebuild
b/net-vpn/tor/tor-0.4.6.3_rc.ebuild
deleted file mode 100644
index b58b53b2f97..000
--- a/net-vpn/tor/tor-0.4.6.3_rc.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
-
-MY_PV="$(ver_rs 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/;
-SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
- https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
- verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
-fi
-IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening
test zstd"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
-
-BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
-DEPEND="
- dev-libs/libevent:=[ssl]
- sys-libs/zlib
- caps? ( sys-libs/libcap )
- man? ( app-text/asciidoc )
- dev-libs/openssl:0=[-bindist]
- lzma? ( app-arch/xz-utils )
- scrypt? ( app-crypt/libscrypt )
- seccomp? ( >=sys-libs/libseccomp-2.4.1 )
- systemd? ( sys-apps/systemd )
- zstd? ( app-arch/zstd )"
-RDEPEND="
- acct-user/tor
- acct-group/tor
- ${DEPEND}
- selinux? ( sec-policy/selinux-tor )"
-
-# bug #764260
-DEPEND+="
- test? (
- ${DEPEND}
- ${PYTHON_DEPS}
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
-)
-
-DOCS=()
-
-RESTRICT="!test? ( test )"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- use doc && DOCS+=( README ChangeLog
[gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/
commit: 80b8ea590bc5059943d9e8f212443c19dcb9492e
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 04:08:05 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 04:08:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80b8ea59
net-vpn/tor: add 0.4.6.4_rc
Signed-off-by: Sam James gentoo.org>
net-vpn/tor/Manifest | 2 +
net-vpn/tor/tor-0.4.6.4_rc.ebuild | 108 ++
2 files changed, 110 insertions(+)
diff --git a/net-vpn/tor/Manifest b/net-vpn/tor/Manifest
index c48ab268532..d2ec7c52d00 100644
--- a/net-vpn/tor/Manifest
+++ b/net-vpn/tor/Manifest
@@ -6,3 +6,5 @@ DIST tor-0.4.5.8.tar.gz 7826458 BLAKE2B
f81f690922ce2e46083706dcf8173720e9527487
DIST tor-0.4.5.8.tar.gz.asc 833 BLAKE2B
80be1b4981771c797b15cf695299c32e68acc4fd5e880d794479956fa75604088cd26f7e99e1a11e10290786b00ffa40f099ac11b9a75d6bd557ed30caf3d605
SHA512
3fd05701f908434eed13970abe989182b9b6af0e4824d1d258a74ce29230a928b06d88d5c398d7031d71048fbeb46185a9d76d8a5d239ee3c58cf41f90ae08c7
DIST tor-0.4.6.3-rc.tar.gz 7734759 BLAKE2B
13f96813db9aa77416b0c5a9031b84ea4a42ebd1d4c6b2740f009bbf10fea3f49591a307fa8992007d6b92413d755875d74d478e8192284f32e692f448180bc3
SHA512
0d9d400e0d61a15ef801b430e0acb7eee369fdd62b78e450759d2fa08363e78bd2a301ce87796a37ab8630ce4669021b5100dedc1ffb983159893b1769d01a61
DIST tor-0.4.6.3-rc.tar.gz.asc 833 BLAKE2B
15b614758f719916ba38a1a70f99aff3d14d8b38105963edf708987dc383d9157024b1dfbf7e248a6275bab33cc1a8d599a14a08e29d4d9986b9b0ffbd3e93d6
SHA512
1fc31fd4cd4c1d40e25797b0bdf2408bc81ea664e31ec21961b81f25d13b4ddbe7e6db9a50c52e6f5492d7177817e753d7bd3383ac6486e6f8d6c01bdbb2ce8c
+DIST tor-0.4.6.4-rc.tar.gz 7735733 BLAKE2B
904de2a8993ba9d767103c9d8df1d8b43e9146fd117998d356a9db5e2b922537829baf4c316cc4a5d369ab3cf3c53c9536289358148d664cd6e06a66182cb839
SHA512
87deaa1f7b9cb2d1a5c75db18f95bfa85b3974f407188b436fe71f82467c2bc9e072e81da386be1ae9c2e07459684fb97705dd72089efaee853cf926c19082a3
+DIST tor-0.4.6.4-rc.tar.gz.asc 833 BLAKE2B
a4b99eea521809d99f401730da7a666b327d00860908d7c5d66777dd55379d67428f1b430aa1f36065d606c5e32bc897e2fb05b28043736f6d05bbab118e328c
SHA512
500fdaa70ddc0fdb06f6f508a8cfdd28253c6997966925ad1f748a8dcbd20325691fac63ea434997ccf12a7c117d6d4f8e4fda37331ea727afb503b3dfc75db8
diff --git a/net-vpn/tor/tor-0.4.6.4_rc.ebuild
b/net-vpn/tor/tor-0.4.6.4_rc.ebuild
new file mode 100644
index 000..b58b53b2f97
--- /dev/null
+++ b/net-vpn/tor/tor-0.4.6.4_rc.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
+
+MY_PV="$(ver_rs 4 -)"
+MY_PF="${PN}-${MY_PV}"
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://www.torproject.org/;
+SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
+ https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
+ verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
+S="${WORKDIR}/${MY_PF}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+fi
+IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening
test zstd"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
+
+BDEPEND="verify-sig? ( app-crypt/openpgp-keys-tor )"
+DEPEND="
+ dev-libs/libevent:=[ssl]
+ sys-libs/zlib
+ caps? ( sys-libs/libcap )
+ man? ( app-text/asciidoc )
+ dev-libs/openssl:0=[-bindist]
+ lzma? ( app-arch/xz-utils )
+ scrypt? ( app-crypt/libscrypt )
+ seccomp? ( >=sys-libs/libseccomp-2.4.1 )
+ systemd? ( sys-apps/systemd )
+ zstd? ( app-arch/zstd )"
+RDEPEND="
+ acct-user/tor
+ acct-group/tor
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-tor )"
+
+# bug #764260
+DEPEND+="
+ test? (
+ ${DEPEND}
+ ${PYTHON_DEPS}
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.2.7.4-torrc.sample.patch
+)
+
+DOCS=()
+
+RESTRICT="!test? ( test )"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ use doc && DOCS+=( README ChangeLog ReleaseNotes doc/HACKING )
+ export ac_cv_lib_cap_cap_init=$(usex caps)
+ econf \
+ --localstatedir="${EPREFIX}/var" \
+ --disable-all-bugs-are-fatal \
+ --enable-system-torrc \
+ --disable-android \
+ --disable-html-manual \
+ --disable-libfuzzer \
+ --enable-missing-doc-warnings \
+ --disable-module-dirauth \
+ --enable-pic \
+ --disable-rust \
+ --disable-restart-debugging \
+ --disable-zstd-advanced-apis \
+ $(use_enable
[gentoo-commits] repo/gentoo:master commit in: media-sound/gpodder/
commit: 6ca6eb98be864dd450ff5963be2476e14c608ccd Author: Sam James gentoo org> AuthorDate: Thu Jun 10 04:00:58 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jun 10 04:00:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca6eb98 media-sound/gpodder: add github remote-id Signed-off-by: Sam James gentoo.org> media-sound/gpodder/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml index f0585120893..09aa57ae4e7 100644 --- a/media-sound/gpodder/metadata.xml +++ b/media-sound/gpodder/metadata.xml @@ -6,4 +6,7 @@ Gentoo Sound project + + gpodder/gpodder +
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp5/
commit: 4e8107f630fdcbc8bba8c72fab6437313f77944a
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 03:54:41 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:54:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8107f6
dev-ml/camlp5: add 8.00.01
Signed-off-by: Sam James gentoo.org>
dev-ml/camlp5/Manifest | 1 +
dev-ml/camlp5/camlp5-8.00.01.ebuild | 58 +
2 files changed, 59 insertions(+)
diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest
index 59d7550ec11..a8818df9974 100644
--- a/dev-ml/camlp5/Manifest
+++ b/dev-ml/camlp5/Manifest
@@ -2,4 +2,5 @@ DIST camlp5-7.11.tar.gz 878224 BLAKE2B
f384764da43653a2f75664681a4f202ec84497720
DIST camlp5-7.12.tar.gz 1008350 BLAKE2B
8f390f6d617a6ef029462aa74ca4d80c0e2eb267bb6957aac43fdecc425aae34dfc7f3e572c8a1f4ee6b032dd90b3b8262094f80a19ea0bb19b80a88d22d3f28
SHA512
233d973b0a968a7812b977e8a37da8e8daa0f3ef81ca7c473d83c1602380dae6c14f94daffb6bb799f8d90fab121238a46e89a233202cd6f622b0da2f728c0c0
DIST camlp5-7.13.tar.gz 1031832 BLAKE2B
2afd7e269092d9c40f263e9ce92b3b9f66b0b3f0ae01da43e2094c6a919aa9f26790030f835b630547d51e7bb4a08e74ac8522e7f308864896fa0414370f8f2f
SHA512
8ab94b951e6791be895c70e32b930e498229c9ba7bccc505a3e7c2a91ca12fe038b979b9d5822b43e9c74ee2bf552efa1af7a61f1d287100803efb540d5db8b2
DIST camlp5-7.14.tar.gz 1044110 BLAKE2B
c9aa5be80df8d2c376fc41c157b2cd86658dbb90e1babd346b7681afd7453649c7f3682f95f238e51b74b3b3a7a2c5b5a854be892b30a7d1e3b62c3272f5442e
SHA512
1b39949c532ca622b01a8e800aa1dcad34f1c944ffe580003642bd742dedc158f3ee54602f3b05f89c0e259525d7feed101b971ebd589449b6d56046389a5bf6
+DIST camlp5-8.00.01.tar.gz 1321790 BLAKE2B
df4403af56cd07f8e07745bdb73f698ddba24803cde22f11cfbeda425d4360f51be45a92b3f522c52a204f867bb3403dacebf20bfe463f6fd751901102ef2213
SHA512
f40e57845ac4a14cf260ddd9df616d12df09f67efaf6735e915598aee981721e8203bf9203fb83d08e34e43021c08003de64dbf3bdcd4d12fd079542fb7649aa
DIST camlp5-8.00.tar.gz 1321320 BLAKE2B
14957ea83e40f3e2f68c7cbbec1ab84325eba1057f38905a37f9516a99a009024ee0b463cf50d23d94e710b027b835dd51153a429c8bda22be7fe95dc911
SHA512
6a0d19ced4d94cd3afebfbc373d344229c5faf088e8910dea32ed4dfa841dd9844c72849f8a6281e2bce55295665eae90391cf29d062a44b083761a9e04bce93
diff --git a/dev-ml/camlp5/camlp5-8.00.01.ebuild
b/dev-ml/camlp5/camlp5-8.00.01.ebuild
new file mode 100644
index 000..fe4e5ebe576
--- /dev/null
+++ b/dev-ml/camlp5/camlp5-8.00.01.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib vcs-clean
+
+DESCRIPTION="A preprocessor-pretty-printer of ocaml"
+HOMEPAGE="https://camlp5.github.io/;
+SRC_URI="https://github.com/camlp5/camlp5/archive/rel${PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-rel${PV}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc +ocamlopt"
+
+DEPEND="
+ >=dev-lang/ocaml-3.10:=[ocamlopt?]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ egit_clean
+ default
+}
+
+src_configure() {
+ ./configure \
+ --strict \
+ -prefix /usr \
+ -bindir /usr/bin \
+ -libdir /usr/$(get_libdir)/ocaml \
+ -mandir /usr/share/man || die "configure failed"
+}
+
+src_compile() {
+ ulimit -s 1153
+ emake out
+ if use ocamlopt; then
+ emake opt
+ emake opt.opt
+ fi
+}
+
+src_test() {
+ emake bootstrap
+}
+
+src_install() {
+ emake DESTDIR="${ED}" install
+ # findlib support
+ insinto "$(ocamlfind printconf destdir)/${PN}"
+ doins etc/META
+
+ dodoc -r doc/*
+ dodoc CHANGES DEVEL ICHANGES README.md UPGRADING MODE
+}
[gentoo-commits] repo/gentoo:master commit in: media-sound/gpodder/
commit: 9a3be82673c890ea1662912637426b89fe35ea65 Author: Sam James gentoo org> AuthorDate: Thu Jun 10 03:52:20 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jun 10 03:54:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3be826 media-sound/gpodder: mark ALLARCHES Signed-off-by: Sam James gentoo.org> media-sound/gpodder/metadata.xml | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml index 39626a990be..f0585120893 100644 --- a/media-sound/gpodder/metadata.xml +++ b/media-sound/gpodder/metadata.xml @@ -1,8 +1,9 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -so...@gentoo.org -Gentoo Sound project - + + so...@gentoo.org + Gentoo Sound project + +
[gentoo-commits] repo/gentoo:master commit in: dev-python/podcastparser/
commit: f9ef8519523f30aa1c12f48723dd355ff4399337
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 03:51:58 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:54:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ef8519
dev-python/podcastparser: add 0.6.6
Signed-off-by: Sam James gentoo.org>
dev-python/podcastparser/Manifest | 1 +
dev-python/podcastparser/metadata.xml | 1 +
dev-python/podcastparser/podcastparser-0.6.6.ebuild | 19 +++
3 files changed, 21 insertions(+)
diff --git a/dev-python/podcastparser/Manifest
b/dev-python/podcastparser/Manifest
index b275207085a..74166542207 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1 +1,2 @@
DIST podcastparser-0.6.5.tar.gz 22232 BLAKE2B
1fcf115954e3394aede643ef28ea7eb13c2969ad3125f82dcfefbb457d61f768247d07d3150fe8adc7aeceb9bb9f0026a2e55f42b3f2a6da76b977528ebd013d
SHA512
770d2376eb7d029dc033f46f55d00e02b8040c72c670338ad52ecf065ec4ffd291c6e2ec02cf9b038f8608c7c549808ff14f95017f508bb1526bb79b413e136a
+DIST podcastparser-0.6.6.tar.gz 23482 BLAKE2B
3bdfefe0eafb7d89dfc0063b0fd61c1f5634e381ec6cba634cd9b054dc51476cd0c37267fc40db317ee3d192ea52b4da18e8efc387ad81c6edac25caf7c94147
SHA512
aee6cb72157242afe9f4d9bd201b9538051cce1fc6a153a03206ad041fbff7c99b69659ee4a9c8cbf5583c1a027a9d171943882cb3a48e4ff7f84602cccf2d74
diff --git a/dev-python/podcastparser/metadata.xml
b/dev-python/podcastparser/metadata.xml
index 9330487cd7f..76bd6abc1ae 100644
--- a/dev-python/podcastparser/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -5,6 +5,7 @@
so...@gentoo.org
Gentoo Sound project
+
podcastparser
diff --git a/dev-python/podcastparser/podcastparser-0.6.6.ebuild
b/dev-python/podcastparser/podcastparser-0.6.6.ebuild
new file mode 100644
index 000..66dbeee8186
--- /dev/null
+++ b/dev-python/podcastparser/podcastparser-0.6.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Podcast parser for the gpodder client"
+HOMEPAGE="https://github.com/gpodder/podcastparser;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
[gentoo-commits] repo/gentoo:master commit in: media-sound/gpodder/
commit: c1036ae01b7030aab9b577e7bd14b607ea4420ac
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 03:50:58 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:54:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1036ae0
media-sound/gpodder: add 3.10.20
Signed-off-by: Sam James gentoo.org>
media-sound/gpodder/Manifest | 1 +
media-sound/gpodder/gpodder-3.10.20.ebuild | 71 ++
2 files changed, 72 insertions(+)
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 78ef06e18e8..050a5c1c75f 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1 +1,2 @@
DIST gpodder-3.10.16.tar.gz 1058386 BLAKE2B
d73bc8a9d9d2cfe642a6c1e7ae3e7811e05db8c1ebf566904e669a5f9d029c6bce73599da737d25f42c4740d23537b1c414e7a23cf15076394fb714a2f33c79c
SHA512
ce9525864e5a640dd82fb535021d63e1d1ddeb7785774b00c668ff86a279a45e075ab7488120ec93d1a07a0a943daa0abb786f822d74866e0fd8c6713d7f8531
+DIST gpodder-3.10.20.tar.gz 1081171 BLAKE2B
b2a07a3d5ce02cc46d7dd5999287b6e0bb96149f2fbf613b0d70b8d3b04d4cd29dcd1b78b4584709d1613c9a5478d39c3cb9be35a274358d56aa593f0196e6b2
SHA512
93cae9cc6d7f3a7754e24f7e962d195788f5f344992a4a3f3be9fd9acf419728b94ce009e1a2e14faa64803ebba098e8199a8d43ed33f5f3e02eabde1fe5c3be
diff --git a/media-sound/gpodder/gpodder-3.10.20.ebuild
b/media-sound/gpodder/gpodder-3.10.20.ebuild
new file mode 100644
index 000..3be14aeb7ee
--- /dev/null
+++ b/media-sound/gpodder/gpodder-3.10.20.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 optfeature xdg
+
+DESCRIPTION="A free cross-platform podcast aggregator"
+HOMEPAGE="https://gpodder.github.io/;
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
+
+# As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
+# ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
+# support python3
+COMMON_DEPEND="
+ $(python_gen_cond_dep '
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+ >=dev-python/podcastparser-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/mygpoclient-1.8[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ ')
+ bluetooth? ( net-wireless/bluez )
+ mtp? ( >=media-libs/libmtp-1.0.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ kernel_linux? ( sys-apps/iproute2 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/desktop-file-utils
+ dev-util/intltool
+ sys-apps/help2man
+ test? (
+ dev-python/minimock
+ dev-python/pytest-localserver
+ )
+"
+
+src_prepare() {
+ default
+
+ sed -i -e 's:--cov=gpodder::' makefile || die
+}
+
+src_test() {
+ emake releasetest
+}
+
+src_install() {
+ emake PYTHON=${EPYTHON} DESTDIR="${D}" install
+ distutils-r1_src_install
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ optfeature "for the youtube-dl extension" net-misc/youtube-dl
+}
[gentoo-commits] repo/gentoo:master commit in: app-admin/rasdaemon/, app-admin/rasdaemon/files/
commit: 6294ab61ad13da4a283554975b9f3d0c502a1f8d
Author: Matthew Thode gentoo org>
AuthorDate: Thu Jun 10 03:50:50 2021 +
Commit: Matthew Thode gentoo org>
CommitDate: Thu Jun 10 03:51:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6294ab61
app-admin/rasdaemon: fix sysconfig dir
uses https://github.com/mchehab/rasdaemon/pull/46
Closes: https://bugs.gentoo.org/795132
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Matthew Thode gentoo.org>
.../rasdaemon/files/sysconfig-fix-0.6.7.patch | 32 ++
app-admin/rasdaemon/rasdaemon-0.6.7.ebuild | 4 +++
2 files changed, 36 insertions(+)
diff --git a/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
b/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
new file mode 100644
index 000..ce4f5ce92bc
--- /dev/null
+++ b/app-admin/rasdaemon/files/sysconfig-fix-0.6.7.patch
@@ -0,0 +1,32 @@
+From 2379c720a7e490854a2f352ca53af6fbd99c0832 Mon Sep 17 00:00:00 2001
+From: Matt Whitlock
+Date: Wed, 9 Jun 2021 10:25:18 -0400
+Subject: [PATCH] configure.ac: fix SYSCONFDEFDIR default value
+
+configure.ac was using AC_ARG_WITH incorrectly, yielding a generated configure
script like:
+
+# Check whether --with-sysconfdefdir was given.
+if test "${with_sysconfdefdir+set}" = set; then :
+ withval=$with_sysconfdefdir; SYSCONFDEFDIR=$withval
+else
+ "/etc/sysconfig"
+fi
+
+This commit fixes the default case so that the SYSCONFDEFDIR variable is
assigned the value "/etc/sysconfig" rather than trying to execute
"/etc/sysconfig" as a command.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f7d1947..33b81fe 100644
+--- a/configure.ac
b/configure.ac
+@@ -172,7 +172,7 @@ AC_SUBST([RASSTATEDIR])
+ AC_ARG_WITH(sysconfdefdir,
+ AC_HELP_STRING([--with-sysconfdefdir=DIR], [rasdaemon environment file
dir]),
+ [SYSCONFDEFDIR=$withval],
+-["/etc/sysconfig"])
++[SYSCONFDEFDIR=/etc/sysconfig])
+ AC_SUBST([SYSCONFDEFDIR])
+
+ AC_DEFINE([RAS_DB_FNAME], ["ras-mc_event.db"], [ras events database])
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
index c5aa842b5d0..add264d2374 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
@@ -25,6 +25,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/sysconfig-fix-0.6.7.patch"
+)
+
pkg_setup() {
linux-info_pkg_setup
local CONFIG_CHECK="~ACPI_EXTLOG"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/
commit: 4578daf387523650389985ad579c9578f0a4bd64
Author: Bernd Waibel posteo net>
AuthorDate: Wed Jun 2 15:48:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:37:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4578daf3
sci-libs/vtk: add python-3.9 support
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Sam James gentoo.org>
sci-libs/vtk/vtk-8.2.0-r1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-libs/vtk/vtk-8.2.0-r1.ebuild b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
index 9ab67fa0c1e..4d29ebbccca 100644
--- a/sci-libs/vtk/vtk-8.2.0-r1.ebuild
+++ b/sci-libs/vtk/vtk-8.2.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
WEBAPP_OPTIONAL=yes
WEBAPP_MANUAL_SLOT=yes
@@ -216,7 +216,7 @@ src_configure() {
-DVTK_Group_Views=$(usex views)
-DVTK_Group_Web=$(usex web)
-DVTK_SMP_IMPLEMENTATION_TYPE="$(usex tbb TBB Sequential)"
- -DVTK_WWW_DIR="${ED}/${MY_HTDOCSDIR}"
+ -DVTK_WWW_DIR="${EPREFIX}/${MY_HTDOCSDIR}"
-DVTK_WRAP_JAVA=$(usex java)
-DVTK_WRAP_PYTHON=$(usex python)
-DVTK_WRAP_PYTHON_SIP=$(usex python)
@@ -261,7 +261,7 @@ src_configure() {
-DSIP_INCLUDE_DIR="$(python_get_includedir)"
-DVTK_PYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DVTK_PYTHON_LIBRARY="$(python_get_library_path)"
- -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX}
--root=${D}"
+# -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${EPREFIX}
--root=${D}"
-DVTK_USE_SYSTEM_SIX=ON
)
fi
[gentoo-commits] repo/gentoo:master commit in: sci-libs/vtk/files/, sci-libs/vtk/
commit: 2728a6a5f2c0a39f44ceee464a764bec6da2c320
Author: Bernd Waibel posteo net>
AuthorDate: Thu Jun 3 16:52:37 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:37:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2728a6a5
sci-libs/vtk: improve all-modules USE flag
- add missing flags to REQUIRED_USE
- add new mysql USE flag - needed by all-modules, adds new dependency on
dev-db/mysql-connector-c. Dev-db/mariadb-connector-c isn't supported
by this version. Fix an issue with using of deprecated my_bool when
using mysql-connector-c.
- remove xdmf2 USE flag, block sci-libs/xdmf2 with all-modules:
sci-libs/xdmf2 doesn't ship any cmake configuration files, which leads
to configuration errors when trying to build against external xdmf2
- block sci-libs/xdmf2: when built against internal xdmf2, there are header
file collisions with the header files installed by sci-libs/xdmf2
- add dependency on sci-libs/kissfft, bug #754684) and drop bundled
- fix an issue with xdmf3 library being installed in both library locations,
lib and lib64
- fix QA issues with RPATH
- byte compile python files
- disable searching for zfp (no package in tree)
- addresses some QA issues with defined but unused cmake variables: fixing all
of them would need a thorough testing of each single USE flag and
checking
where these belong to, in this over-complex build system (bug #660582)
Closes: https://bugs.gentoo.org/793839
Closes: https://bugs.gentoo.org/754684
Closes: https://bugs.gentoo.org/646846
Bug: https://bugs.gentoo.org/660582
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Sam James gentoo.org>
...01-fix-library-installation-dir-for-xdmf3.patch | 57 +++
sci-libs/vtk/vtk-8.2.0-r2.ebuild | 382 +
2 files changed, 439 insertions(+)
diff --git
a/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
new file mode 100644
index 000..d03cab326f4
--- /dev/null
+++
b/sci-libs/vtk/files/vtk-8.2.0-0001-fix-library-installation-dir-for-xdmf3.patch
@@ -0,0 +1,57 @@
+From 3aad9ec6004b7e3a82817f2f1e2840fc5f07c050 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Thu, 3 Jun 2021 13:13:38 +0200
+Subject: [PATCH] fix library installation dir for xdmf3
+
+Signed-off-by: Bernd Waibel
+---
+ ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt | 14 +++---
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+index 86d688f8..7d009dfe 100644
+--- a/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
b/ThirdParty/xdmf3/vtkxdmf3/core/CMakeLists.txt
+@@ -269,10 +269,10 @@ endif()
+
+ if(UNIX)
+ if (BUILD_SHARED_LIBS)
+- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.so
++ set(XDMFCORE_LIBRARY
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.so
+ PARENT_SCOPE)
+ else()
+- set(XDMFCORE_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/libXdmfCore.a
++ set(XDMFCORE_LIBRARY
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/libXdmfCore.a
+ PARENT_SCOPE)
+ endif()
+ endif()
+@@ -297,13 +297,13 @@ if (NOT XDMF_INSTALL_NO_DEVELOPMENT)
+ endif()
+ install(TARGETS XdmfCore
+ RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ LIBRARY DESTINATION lib${LIB_SUFFIX}
++ ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ if (XDMF_STATIC_AND_SHARED AND BUILD_SHARED_LIBS)
+ install(TARGETS XdmfCore_Static
+ RUNTIME DESTINATION bin
+-LIBRARY DESTINATION lib
+-ARCHIVE DESTINATION lib)
++LIBRARY DESTINATION lib${LIB_SUFFIX}
++ARCHIVE DESTINATION lib${LIB_SUFFIX})
+ endif ()
+
+ if (Boost_FOUND)
+@@ -329,7 +329,7 @@ set(XdmfCore_INCLUDE_DIRS
+ CACHE INTERNAL "")
+
+ set(XDMF_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include PARENT_SCOPE)
+-set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib)
++set(XDMF_LIBRARIES ${XDMF_LIBRARIES} ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ set(XDMF_DIR ${CMAKE_INSTALL_PREFIX} PARENT_SCOPE)
+ set(XDMF_BINARIES ${XDMF_BINARIES} ${CMAKE_INSTALL_PREFIX}/bin)
+
+--
+2.31.1
+
diff --git a/sci-libs/vtk/vtk-8.2.0-r2.ebuild b/sci-libs/vtk/vtk-8.2.0-r2.ebuild
new file mode 100644
index 000..4335d1c44a2
--- /dev/null
+++ b/sci-libs/vtk/vtk-8.2.0-r2.ebuild
@@ -0,0 +1,382 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+WEBAPP_OPTIONAL=yes
+WEBAPP_MANUAL_SLOT=yes
+
+# Short package version
+SPV="$(ver_cut 1-2)"
+inherit flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
toolchain-funcs cmake virtualx webapp
+
+DESCRIPTION="The Visualization Toolkit"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/oce/
commit: c304d3308ecaab8c80726d4c6c4c5b17a4bcf188
Author: Bernd Waibel posteo net>
AuthorDate: Fri Jun 4 06:03:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:37:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c304d330
sci-libs/oce: adjust dependency on sci-libs/vtk
The xdmf2 USE flag has been removed in latest vtk-8, as well as in vtk-9. Also
it's not needed for proper building of the package.
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21110
Signed-off-by: Sam James gentoo.org>
sci-libs/oce/oce-0.18.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/oce/oce-0.18.3-r2.ebuild
b/sci-libs/oce/oce-0.18.3-r2.ebuild
index 9a331c5771e..d9c1053179f 100644
--- a/sci-libs/oce/oce-0.18.3-r2.ebuild
+++ b/sci-libs/oce/oce-0.18.3-r2.ebuild
@@ -29,7 +29,7 @@ DEPEND="
freeimage? ( media-libs/freeimage )
gl2ps? ( x11-libs/gl2ps )
tbb? ( dev-cpp/tbb )
- vtk? ( =sci-libs/vtk-8*[boost,imaging,qt5,python,rendering,views,xdmf2]
)"
+ vtk? ( =sci-libs/vtk-8*[boost,imaging,qt5,python,rendering,views] )"
RDEPEND="${DEPEND}"
CHECKREQS_MEMORY="256M"
[gentoo-commits] repo/gentoo:master commit in: net-wireless/soapysdr/
commit: 76878357cf012d531037c2df49a47f2b153d5f46
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 03:36:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:36:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76878357
net-wireless/soapysdr: conditionalise Python usage in src_install
Closes: https://bugs.gentoo.org/794958
Signed-off-by: Sam James gentoo.org>
net-wireless/soapysdr/soapysdr-0.7.2.ebuild | 7 +--
net-wireless/soapysdr/soapysdr-.ebuild | 7 +--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
b/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
index ffd714150f9..0d446573c63 100644
--- a/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,5 +53,8 @@ src_configure() {
src_install() {
cmake_src_install
- python_foreach_impl python_optimize
+
+ if use python; then
+ python_foreach_impl python_optimize
+ fi
}
diff --git a/net-wireless/soapysdr/soapysdr-.ebuild
b/net-wireless/soapysdr/soapysdr-.ebuild
index ffd714150f9..0d446573c63 100644
--- a/net-wireless/soapysdr/soapysdr-.ebuild
+++ b/net-wireless/soapysdr/soapysdr-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,5 +53,8 @@ src_configure() {
src_install() {
cmake_src_install
- python_foreach_impl python_optimize
+
+ if use python; then
+ python_foreach_impl python_optimize
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 3ee727dcb4562960dd1a9382203afc8450155976 Author: Sam James gentoo org> AuthorDate: Thu Jun 10 03:35:35 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jun 10 03:35:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee727dc media-gfx/blender: drop obsolete comment Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-2.93.0.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-gfx/blender/blender-2.93.0.ebuild b/media-gfx/blender/blender-2.93.0.ebuild index a3689a00f3d..e51130458fe 100644 --- a/media-gfx/blender/blender-2.93.0.ebuild +++ b/media-gfx/blender/blender-2.93.0.ebuild @@ -5,8 +5,6 @@ EAPI=7 PYTHON_COMPAT=( python3_9 ) -# TODO: restoring subversion later -# https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672 inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 toolchain-funcs xdg-utils DESCRIPTION="3D Creation/Animation/Publishing System"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: d1442490653cf38e422983fbe89b23a27bd14993
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 03:34:39 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 03:34:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1442490
media-gfx/blender: add test distfile
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 2 ++
media-gfx/blender/blender-2.83.15.ebuild | 13 +
media-gfx/blender/blender-2.93.0.ebuild | 10 +-
media-gfx/blender/blender-.ebuild| 10 --
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index a0063395f2e..cd0d802dee5 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,4 @@
+DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B
8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6
SHA512
3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9
DIST blender-2.83.15.tar.xz 39125740 BLAKE2B
687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa
SHA512
2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25
+DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
SHA512
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
DIST blender-2.93.0.tar.xz 42967016 BLAKE2B
1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3
SHA512
660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
diff --git a/media-gfx/blender/blender-2.83.15.ebuild
b/media-gfx/blender/blender-2.83.15.ebuild
index ebb25670c0d..28616ae54a1 100644
--- a/media-gfx/blender/blender-2.83.15.ebuild
+++ b/media-gfx/blender/blender-2.83.15.ebuild
@@ -5,8 +5,6 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-# TODO: restore subversion later
-# https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672
inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
@@ -17,6 +15,7 @@ if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git;
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.83.1-tests.tar.bz2
)"
KEYWORDS="~amd64 ~x86"
fi
@@ -93,7 +92,6 @@ RDEPEND="${PYTHON_DEPS}
sdl? ( media-libs/libsdl2[sound,joystick] )
sndfile? ( media-libs/libsndfile )
tbb? ( dev-cpp/tbb )
- test? ( dev-vcs/subversion )
tiff? ( media-libs/tiff )
valgrind? ( dev-util/valgrind )
"
@@ -149,16 +147,15 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} = ** ]] ; then
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
git-r3_src_unpack
else
default
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
fi
- #if use test; then
- # subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- #fi
+ if use test; then
+ mkdir -p lib/tests || die
+ mv "${WORKDIR}"/blender*tests* lib/tests || die
+ fi
}
src_prepare() {
diff --git a/media-gfx/blender/blender-2.93.0.ebuild
b/media-gfx/blender/blender-2.93.0.ebuild
index 3f44583e7df..a3689a00f3d 100644
--- a/media-gfx/blender/blender-2.93.0.ebuild
+++ b/media-gfx/blender/blender-2.93.0.ebuild
@@ -17,6 +17,7 @@ if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git;
else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ SRC_URI+=" test? (
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.93.0-tests.tar.bz2
)"
KEYWORDS="~amd64"
fi
@@ -154,16 +155,15 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} = ** ]] ; then
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests
git-r3_src_unpack
else
default
-
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
fi
- #if use test; then
- # subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- #fi
+ if use test; then
+ mkdir -p
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/targets/, catalyst/
commit: ad54d2e7669326cb313cccf281544559463fbcad
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 06:17:31 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jun 10 01:38:47 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ad54d2e7
catalyst: Replace snakeoil's locks with fasteners
To no great surprise, the existing locking was broken. For example,
clear_chroot() releases the lock. It is called by unpack(), which is
part of prepare_sequence. The result is that the whole build could be
done without holding the lock.
Just lock around run(). It's not apparent that finer-grained locking
does anything for us.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/clearbase.py | 2 --
catalyst/base/stagebase.py | 10 +++-
catalyst/lock.py | 58
catalyst/targets/snapshot.py | 6 ++---
4 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index dcf6c523..6218330e 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -27,12 +27,10 @@ class ClearBase():
self.resume.clear_all(remove=True)
def clear_chroot(self):
-self.chroot_lock.unlock()
log.notice('Clearing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755)
def remove_chroot(self):
-self.chroot_lock.unlock()
log.notice('Removing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755, remove=True)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 448d6265..10cffd4c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -8,6 +8,7 @@ import sys
from pathlib import Path
+import fasteners
import libmount
import toml
@@ -25,7 +26,6 @@ from catalyst.support import (CatalystError, file_locate,
normpath,
from catalyst.base.targetbase import TargetBase
from catalyst.base.clearbase import ClearBase
from catalyst.base.genbase import GenBase
-from catalyst.lock import LockDir, LockInUse
from catalyst.fileops import ensure_dirs, clear_dir, clear_path
from catalyst.base.resume import AutoResume
@@ -36,9 +36,6 @@ def run_sequence(sequence):
sys.stdout.flush()
try:
func()
-except LockInUse:
-log.error('Unable to aquire the lock...')
-return False
except Exception:
log.error('Exception running action sequence %s',
func.__name__, exc_info=True)
@@ -478,7 +475,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"""
self.settings["chroot_path"] = normpath(self.settings["storedir"] +
"/tmp/" +
self.settings["target_subpath"].rstrip('/'))
-self.chroot_lock = LockDir(self.settings["chroot_path"])
def set_autoresume_path(self):
self.settings["autoresume_path"] = normpath(pjoin(
@@ -1366,8 +1362,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
pass
def run(self):
-self.chroot_lock.write_lock()
+with fasteners.InterProcessLock(self.settings["chroot_path"] +
'.lock'):
+return self._run()
+def _run(self):
if "clear-autoresume" in self.settings["options"]:
self.clear_autoresume()
diff --git a/catalyst/lock.py b/catalyst/lock.py
deleted file mode 100644
index e31745b2..
--- a/catalyst/lock.py
+++ /dev/null
@@ -1,58 +0,0 @@
-
-import os
-
-from contextlib import contextmanager
-
-from snakeoil import fileutils
-from snakeoil import osutils
-from catalyst.fileops import ensure_dirs
-
-
-LockInUse = osutils.LockException
-
-class Lock:
-"""
-A fnctl-based filesystem lock
-"""
-def __init__(self, lockfile):
-fileutils.touch(lockfile, mode=0o664)
-os.chown(lockfile, uid=-1, gid=250)
-self.lock = osutils.FsLock(lockfile)
-
-def read_lock(self):
-self.lock.acquire_read_lock()
-
-def write_lock(self):
-self.lock.acquire_write_lock()
-
-def unlock(self):
-# Releasing a write lock is the same as a read lock.
-self.lock.release_write_lock()
-
-class LockDir(Lock):
-"""
-A fnctl-based filesystem lock in a directory
-"""
-def __init__(self, lockdir):
-ensure_dirs(lockdir)
-lockfile = os.path.join(lockdir, '.catalyst_lock')
-
-Lock.__init__(self, lockfile)
-
-@contextmanager
-def read_lock(filename):
-lock = Lock(filename)
-lock.read_lock()
-try:
-yield
-finally:
-lock.unlock()
-
-@contextmanager
-def write_lock(filename):
-lock = Lock(filename)
-lock.write_lock()
-try:
-yield
-finally:
-lock.unlock()
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b494575a..ef68765d 100644
---
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/, catalyst/targets/
commit: 8a9780b8bef53d427fa7d68b7df85e2d34f4dd57
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 06:17:31 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jun 10 01:35:32 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8a9780b8
catalyst: Replace snakeoil's locks with fasteners
To no great surprise, the existing locking was broken. For example,
clear_chroot() releases the lock. It is called by unpack(), which is
part of prepare_sequence. The result is that the whole build could be
done without holding the lock.
Just lock around run(). It's not apparent that finer-grained locking
does anything for us.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/clearbase.py | 2 --
catalyst/base/stagebase.py | 10 +++-
catalyst/lock.py | 58
catalyst/targets/snapshot.py | 6 ++---
4 files changed, 7 insertions(+), 69 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index dcf6c523..6218330e 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -27,12 +27,10 @@ class ClearBase():
self.resume.clear_all(remove=True)
def clear_chroot(self):
-self.chroot_lock.unlock()
log.notice('Clearing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755)
def remove_chroot(self):
-self.chroot_lock.unlock()
log.notice('Removing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755, remove=True)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 448d6265..34d10389 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -8,6 +8,7 @@ import sys
from pathlib import Path
+import fasteners
import libmount
import toml
@@ -25,7 +26,6 @@ from catalyst.support import (CatalystError, file_locate,
normpath,
from catalyst.base.targetbase import TargetBase
from catalyst.base.clearbase import ClearBase
from catalyst.base.genbase import GenBase
-from catalyst.lock import LockDir, LockInUse
from catalyst.fileops import ensure_dirs, clear_dir, clear_path
from catalyst.base.resume import AutoResume
@@ -36,9 +36,6 @@ def run_sequence(sequence):
sys.stdout.flush()
try:
func()
-except LockInUse:
-log.error('Unable to aquire the lock...')
-return False
except Exception:
log.error('Exception running action sequence %s',
func.__name__, exc_info=True)
@@ -478,7 +475,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"""
self.settings["chroot_path"] = normpath(self.settings["storedir"] +
"/tmp/" +
self.settings["target_subpath"].rstrip('/'))
-self.chroot_lock = LockDir(self.settings["chroot_path"])
def set_autoresume_path(self):
self.settings["autoresume_path"] = normpath(pjoin(
@@ -1366,8 +1362,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
pass
def run(self):
-self.chroot_lock.write_lock()
+with fasteners.InterProcessLock(self.chroot_path + '.lock'):
+return self._run()
+def _run(self):
if "clear-autoresume" in self.settings["options"]:
self.clear_autoresume()
diff --git a/catalyst/lock.py b/catalyst/lock.py
deleted file mode 100644
index e31745b2..
--- a/catalyst/lock.py
+++ /dev/null
@@ -1,58 +0,0 @@
-
-import os
-
-from contextlib import contextmanager
-
-from snakeoil import fileutils
-from snakeoil import osutils
-from catalyst.fileops import ensure_dirs
-
-
-LockInUse = osutils.LockException
-
-class Lock:
-"""
-A fnctl-based filesystem lock
-"""
-def __init__(self, lockfile):
-fileutils.touch(lockfile, mode=0o664)
-os.chown(lockfile, uid=-1, gid=250)
-self.lock = osutils.FsLock(lockfile)
-
-def read_lock(self):
-self.lock.acquire_read_lock()
-
-def write_lock(self):
-self.lock.acquire_write_lock()
-
-def unlock(self):
-# Releasing a write lock is the same as a read lock.
-self.lock.release_write_lock()
-
-class LockDir(Lock):
-"""
-A fnctl-based filesystem lock in a directory
-"""
-def __init__(self, lockdir):
-ensure_dirs(lockdir)
-lockfile = os.path.join(lockdir, '.catalyst_lock')
-
-Lock.__init__(self, lockfile)
-
-@contextmanager
-def read_lock(filename):
-lock = Lock(filename)
-lock.read_lock()
-try:
-yield
-finally:
-lock.unlock()
-
-@contextmanager
-def write_lock(filename):
-lock = Lock(filename)
-lock.write_lock()
-try:
-yield
-finally:
-lock.unlock()
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b494575a..ef68765d 100644
--- a/catalyst/targets/snapshot.py
+++
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/, catalyst/, catalyst/base/
commit: b5b921f2e0a490d247e56da635d4d93248a19acc
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 06:17:31 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jun 10 01:15:35 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b5b921f2
catalyst: Replace snakeoil's locks with fasteners
To no great surprise, the existing locking was broken. For example,
clear_chroot() releases the lock. It is called by unpack(), which is
part of prepare_sequence. The result is that the whole build could be
done without holding the lock.
Just lock around run(). It's not apparent that finer-grained locking
does anything for us.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/clearbase.py | 2 --
catalyst/base/stagebase.py | 9 +++
catalyst/lock.py | 58
catalyst/targets/snapshot.py | 6 ++---
4 files changed, 6 insertions(+), 69 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index dcf6c523..6218330e 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -27,12 +27,10 @@ class ClearBase():
self.resume.clear_all(remove=True)
def clear_chroot(self):
-self.chroot_lock.unlock()
log.notice('Clearing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755)
def remove_chroot(self):
-self.chroot_lock.unlock()
log.notice('Removing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755, remove=True)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 448d6265..d15a0df8 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -25,7 +25,6 @@ from catalyst.support import (CatalystError, file_locate,
normpath,
from catalyst.base.targetbase import TargetBase
from catalyst.base.clearbase import ClearBase
from catalyst.base.genbase import GenBase
-from catalyst.lock import LockDir, LockInUse
from catalyst.fileops import ensure_dirs, clear_dir, clear_path
from catalyst.base.resume import AutoResume
@@ -36,9 +35,6 @@ def run_sequence(sequence):
sys.stdout.flush()
try:
func()
-except LockInUse:
-log.error('Unable to aquire the lock...')
-return False
except Exception:
log.error('Exception running action sequence %s',
func.__name__, exc_info=True)
@@ -478,7 +474,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"""
self.settings["chroot_path"] = normpath(self.settings["storedir"] +
"/tmp/" +
self.settings["target_subpath"].rstrip('/'))
-self.chroot_lock = LockDir(self.settings["chroot_path"])
def set_autoresume_path(self):
self.settings["autoresume_path"] = normpath(pjoin(
@@ -1366,8 +1361,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
pass
def run(self):
-self.chroot_lock.write_lock()
+with fasteners.InterProcessLock(self.chroot_path + '.lock'):
+return self._run()
+def _run(self):
if "clear-autoresume" in self.settings["options"]:
self.clear_autoresume()
diff --git a/catalyst/lock.py b/catalyst/lock.py
deleted file mode 100644
index e31745b2..
--- a/catalyst/lock.py
+++ /dev/null
@@ -1,58 +0,0 @@
-
-import os
-
-from contextlib import contextmanager
-
-from snakeoil import fileutils
-from snakeoil import osutils
-from catalyst.fileops import ensure_dirs
-
-
-LockInUse = osutils.LockException
-
-class Lock:
-"""
-A fnctl-based filesystem lock
-"""
-def __init__(self, lockfile):
-fileutils.touch(lockfile, mode=0o664)
-os.chown(lockfile, uid=-1, gid=250)
-self.lock = osutils.FsLock(lockfile)
-
-def read_lock(self):
-self.lock.acquire_read_lock()
-
-def write_lock(self):
-self.lock.acquire_write_lock()
-
-def unlock(self):
-# Releasing a write lock is the same as a read lock.
-self.lock.release_write_lock()
-
-class LockDir(Lock):
-"""
-A fnctl-based filesystem lock in a directory
-"""
-def __init__(self, lockdir):
-ensure_dirs(lockdir)
-lockfile = os.path.join(lockdir, '.catalyst_lock')
-
-Lock.__init__(self, lockfile)
-
-@contextmanager
-def read_lock(filename):
-lock = Lock(filename)
-lock.read_lock()
-try:
-yield
-finally:
-lock.unlock()
-
-@contextmanager
-def write_lock(filename):
-lock = Lock(filename)
-lock.write_lock()
-try:
-yield
-finally:
-lock.unlock()
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b494575a..ef68765d 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -5,11 +5,12 @@ Snapshot target
import subprocess
import sys
+import
[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/
commit: 7da3d02dd4d346906f0bdf7cd0df04f542706bb8
Author: Sebastian Parborg gmail com>
AuthorDate: Tue Apr 27 23:42:58 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da3d02d
media-libs/osl: bump to 1.12.0.2
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/files/osl-1.12.0.2-llvm-11.patch | 29 +++
media-libs/osl/files/osl-1.12.0.2-llvm-12.patch | 240
media-libs/osl/osl-1.12.0.2.ebuild | 88 +
4 files changed, 358 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index db1eb09c70c..d880f7d1d0f 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B
63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767
SHA512
bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B
db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8
SHA512
f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
+DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B
543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d
SHA512
cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
new file mode 100644
index 000..a47bcd4e47d
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
@@ -0,0 +1,29 @@
+From 84c26c0baab8f071270d0fef23175c24d738c73c Mon Sep 17 00:00:00 2001
+From: Brecht Van Lommel
+Date: Mon, 19 Apr 2021 13:49:22 +0200
+Subject: [PATCH] Fix crash generating closure functions calls with LLVM 11
+
+Generating code for prepare_closure and gen_closure was crashing.
+The code now matches the implementation of the removed LLVM function.
+
+Signed-off-by: Brecht Van Lommel
+---
+ src/liboslexec/llvm_util.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f64000..3d468de27 100644
+--- a/src/liboslexec/llvm_util.cpp
b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func,
cspan args)
+ #endif
+ //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+-OSL_DASSERT(llvm::isa(func));
+-llvm::Value *r = builder().CreateCall(llvm::cast(func),
llvm::ArrayRef(args.data(), args.size()));
++llvm::Value* r = builder().CreateCall(
++
llvm::cast(func->getType()->getPointerElementType()), func,
++llvm::ArrayRef(args.data(), args.size()));
+ #else
+ llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef(args.data(), args.size()));
+ #endif
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
new file mode 100644
index 000..dcf9ac863f7
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
@@ -0,0 +1,240 @@
+commit f76ea6220a5f0d59f5f43d3d6d526f1fd09b90f7
+Author: Euan Haahr
+Date: Fri Feb 5 22:51:14 2021 +
+
+Various fixes for LLVM 12 compatibility (1351)
+
+Removed use of options.PrintMachineCode since this has been removed as
+of llvm 12. Converted uses of DebugLoc::get to DILocation::get since
+it has been deprecated and removed as of llvm 12.
+
+PrintMachine code will only be used if llvm is lower than version 12.
+TODO: Needs to be re-added in the new way for LLVM12. (LG just doesn't
+have time to figure this out right now.)
+
+Pass adjustment as various things have been deprecated or changed
+names. (LG)
+
+Signed-off-by: Euan Haahr
+Signed-off-by: Larry Gritz
+
+diff --git a/src/liboslexec/llvm_passes.h b/src/liboslexec/llvm_passes.h
+index 4ec3489c..7c14fc76 100644
+--- a/src/liboslexec/llvm_passes.h
b/src/liboslexec/llvm_passes.h
+@@ -73,9 +73,14 @@ public:
+ // 16 bit and 32 bit native mask representation to be passed as a
+ // livein.
+ m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32,
WidthT);
++# if OSL_LLVM_VERSION >= 112
++m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
++llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
++# else
+ m_wide_zero_initializer =
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/
commit: 44232f680289de7d56e2167815fda9e1b5d07594
Author: Sam James gentoo org>
AuthorDate: Thu Jun 10 00:28:04 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:28:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44232f68
media-gfx/blender: disable tests for now
Needs external resources via SVN. Will upload separately shortly.
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/blender-2.83.15.ebuild | 11 ++-
media-gfx/blender/blender-2.93.0.ebuild | 11 ++-
media-gfx/blender/blender-.ebuild| 11 ++-
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/media-gfx/blender/blender-2.83.15.ebuild
b/media-gfx/blender/blender-2.83.15.ebuild
index e9a3def3b11..ebb25670c0d 100644
--- a/media-gfx/blender/blender-2.83.15.ebuild
+++ b/media-gfx/blender/blender-2.83.15.ebuild
@@ -5,8 +5,9 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 subversion \
- toolchain-funcs xdg-utils
+# TODO: restore subversion later
+# https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
@@ -155,9 +156,9 @@ src_unpack() {
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
fi
- if use test; then
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- fi
+ #if use test; then
+ # subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+ #fi
}
src_prepare() {
diff --git a/media-gfx/blender/blender-2.93.0.ebuild
b/media-gfx/blender/blender-2.93.0.ebuild
index 1cbc831157b..3f44583e7df 100644
--- a/media-gfx/blender/blender-2.93.0.ebuild
+++ b/media-gfx/blender/blender-2.93.0.ebuild
@@ -5,8 +5,9 @@ EAPI=7
PYTHON_COMPAT=( python3_9 )
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 subversion \
- toolchain-funcs xdg-utils
+# TODO: restoring subversion later
+# https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
@@ -160,9 +161,9 @@ src_unpack() {
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
fi
- if use test; then
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- fi
+ #if use test; then
+ # subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+ #fi
}
src_prepare() {
diff --git a/media-gfx/blender/blender-.ebuild
b/media-gfx/blender/blender-.ebuild
index a94519d2777..ab73c944ca8 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -5,8 +5,9 @@ EAPI=7
PYTHON_COMPAT=( python3_9 )
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 subversion \
- toolchain-funcs xdg-utils
+# TODO: subversion commented out for tests for now
+# restoring shortly, see
https://github.com/gentoo/gentoo/pull/20565#issuecomment-857235672
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
@@ -160,9 +161,9 @@ src_unpack() {
TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/tags/blender-${SLOT}-release/lib/tests
fi
- if use test; then
- subversion_fetch ${TESTS_SVN_URL} ../lib/tests
- fi
+ #if use test; then
+ # subversion_fetch ${TESTS_SVN_URL} ../lib/tests
+ #fi
}
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/embree/
commit: b3c1f19a681667a0ed090285f039ec6425eb38d8
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Apr 28 00:50:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c1f19a
media-libs/embree: New package
Embree is a collection of high-performance ray tracing kernels,
developed at Intel. The target users of Embree are graphics application
engineers who want to improve the performance of their photo-realistic
rendering application by leveraging Embree's performance-optimized ray
tracing kernels.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-libs/embree/Manifest | 1 +
media-libs/embree/embree-3.13.0.ebuild | 107 +
media-libs/embree/metadata.xml | 42 +
3 files changed, 150 insertions(+)
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
new file mode 100644
index 000..cc27e4a85af
--- /dev/null
+++ b/media-libs/embree/Manifest
@@ -0,0 +1 @@
+DIST embree-3.13.0.tar.gz 13708421 BLAKE2B
bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080
SHA512
3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
diff --git a/media-libs/embree/embree-3.13.0.ebuild
b/media-libs/embree/embree-3.13.0.ebuild
new file mode 100644
index 000..548f969a2cf
--- /dev/null
+++ b/media-libs/embree/embree-3.13.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree;
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="3"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc raymask ssp +tbb tutorial static-libs
${CPU_FLAGS[@]%:*}"
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ispc? ( dev-lang/ispc )
+ >=media-libs/glfw-3.2.1
+ tbb? ( dev-cpp/tbb )
+ tutorial? (
+ >=media-libs/libpng-1.6.34:0=
+ >=media-libs/openimageio-1.8.7
+ virtual/jpeg:0
+ )
+ virtual/opengl
+"
+DEPEND="${RDEPEND}"
+RESTRICT="mirror"
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+pkg_setup() {
+ CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+ WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages
(CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+ linux-info_pkg_setup
+
+ if ! ( cat /proc/cpuinfo | grep sse2 > /dev/null ) ; then
+ die "You need a CPU with at least sse2 support"
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable RPM package building
+ sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # NOTE: You can make embree accept custom CXXFLAGS by turning off
+ # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you
use
+ # any "march" compile flags. This is because embree builds modules for
the
+ # different supported ISAs and picks the correct one at runtime.
+ # "march" will pull in cpu instructions that shouldn't be in specific
modules
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -march=*
+
+ local mycmakeargs=(
+ -DBUILD_TESTING:BOOL=OFF
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+ -DEMBREE_BACKFACE_CULLING=OFF # default
+ -DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+ -DEMBREE_FILTER_FUNCTION=ON # default
+ -DEMBREE_GEOMETRY_CURVE=ON # default
+ -DEMBREE_GEOMETRY_GRID=ON # default
+ -DEMBREE_GEOMETRY_INSTANCE=ON # default
+ -DEMBREE_GEOMETRY_POINT=ON # default
+ -DEMBREE_GEOMETRY_QUAD=ON # default
+ -DEMBREE_GEOMETRY_SUBDIVISION=ON# default
+ -DEMBREE_GEOMETRY_TRIANGLE=ON # default
+ -DEMBREE_GEOMETRY_USER=ON # default
+ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+ -DEMBREE_IGNORE_INVALID_RAYS=OFF# default
+ -DEMBREE_MAX_ISA:STRING="NONE" # Set to NONE so we can
manually switch on ISAs below
+ -DEMBREE_ISA_AVX=$(usex
[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/files/, media-gfx/blender/
commit: 61c7536f66bd3a6a3347800226cd8dc969671116
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Apr 28 01:08:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c7536f
media-gfx/blender: Slot, bump to 2.93.0, and add live ebuild
Closes: https://bugs.gentoo.org/795003
Closes: https://bugs.gentoo.org/778008
Closes: https://bugs.gentoo.org/774372
Closes: https://bugs.gentoo.org/673422
Closes: https://bugs.gentoo.org/737388
Signed-off-by: Sebastian Parborg gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20565
Signed-off-by: Sam James gentoo.org>
media-gfx/blender/Manifest | 4 +-
...ender-2.83.12.ebuild => blender-2.83.15.ebuild} | 192 +++---
...blender-2.91.2.ebuild => blender-2.93.0.ebuild} | 211
...{blender-2.83.12.ebuild => blender-.ebuild} | 203 ---
.../blender/files/blender-2.83.13-ffmpeg-4_4.patch | 27 +++
.../files/blender-2.83.6-constraints_test.patch| 13 ++
.../files/blender-2.83.6-fix_opevdb_abi.patch | 21 ++
.../blender-2.83.6-libmv_eigen_alignment.patch | 219 +
media-gfx/blender/metadata.xml | 23 +--
9 files changed, 675 insertions(+), 238 deletions(-)
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 46f37a28858..a0063395f2e 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,2 @@
-DIST blender-2.83.12.tar.xz 39132904 BLAKE2B
175e8c5ab9324421f23357bc367b2e70ee8c391130d376d6d53eefbf90529d09921395cd11e7b1709aaa4d24ec6f8df64050869e41bbe211229126db08f22089
SHA512
f313c92e311e852742e74934504fcd3ccd296bcea2499f605cef568e3c615ececd9d70dec5025e4d4ff19f03803c148a8b03a4b68b7ca978554f5b1122c9890b
-DIST blender-2.91.2.tar.xz 42057100 BLAKE2B
f10f838ad6d56135fddf9e9171473e1e589f511a38112845d650436a1eb4da94ea0777571dffc6446f4217dce647b087cf5a18841d7dde2086d187bb8f7d3654
SHA512
9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
+DIST blender-2.83.15.tar.xz 39125740 BLAKE2B
687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa
SHA512
2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25
+DIST blender-2.93.0.tar.xz 42967016 BLAKE2B
1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3
SHA512
660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
diff --git a/media-gfx/blender/blender-2.83.12.ebuild
b/media-gfx/blender/blender-2.83.15.ebuild
similarity index 57%
copy from media-gfx/blender/blender-2.83.12.ebuild
copy to media-gfx/blender/blender-2.83.15.ebuild
index 44b4b4f8849..e9a3def3b11 100644
--- a/media-gfx/blender/blender-2.83.12.ebuild
+++ b/media-gfx/blender/blender-2.83.15.ebuild
@@ -3,25 +3,27 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 subversion \
toolchain-funcs xdg-utils
DESCRIPTION="3D Creation/Animation/Publishing System"
HOMEPAGE="https://www.blender.org;
-SRC_URI="https://download.blender.org/source/${P}.tar.xz;
-
-# Blender can have letters in the version string,
-# so strip off the letter if it exists.
-MY_PV="$(ver_cut 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="amd64 ~x86"
-IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
- abi6-compat abi7-compat alembic collada color-management cuda cycles \
- debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+
+if [[ ${PV} = ** ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.blender.org/blender.git;
+else
+ SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+ KEYWORDS="~amd64 ~x86"
+fi
+
+SLOT="${PV%.*}"
+LICENSE="|| ( GPL-3 BL )"
+IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
+ alembic collada +color-management cuda cycles \
+ debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
man ndof nls openal opencl openimageio openmp opensubdiv \
openvdb osl sdl sndfile standalone test tiff valgrind"
RESTRICT="!test? ( test )"
@@ -30,15 +32,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
cycles? ( openexr tiff openimageio )
- elbeem? ( tbb )
+ fluid? ( tbb )
opencl? ( cycles )
- openvdb? (
- ^^ ( abi6-compat abi7-compat )
- tbb
- )
- osl? ( cycles llvm )
- standalone? ( cycles )"
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/openvdb/
commit: 10c70fd96bbcaa35bacc8d00bb30ef04c3cdf93d
Author: Sebastian Parborg gmail com>
AuthorDate: Tue Apr 27 23:18:55 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c70fd9
media-gfx/openvdb: bump to 8.0.1
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-gfx/openvdb/Manifest | 1 +
media-gfx/openvdb/metadata.xml | 3 +
media-gfx/openvdb/openvdb-8.0.1.ebuild | 122 +
3 files changed, 126 insertions(+)
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index b3d4fe59418..6dea8aee2b9 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,2 +1,3 @@
DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B
e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8
SHA512
f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B
7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29
SHA512
49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
+DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B
e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2
SHA512
6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index 4690483cd9c..b1f9b292a3e 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -27,6 +27,9 @@
Disables newer features to maintain compatibility with
ABI7.
+
+ Disables newer features to maintain compatibility with
ABI8.
+
Build utility binaries
diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild
b/media-gfx/openvdb/openvdb-8.0.1.ebuild
new file mode 100644
index 000..11350d22c91
--- /dev/null
+++ b/media-gfx/openvdb/openvdb-8.0.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="Library for the efficient manipulation of volumetric data"
+HOMEPAGE="https://www.openvdb.org;
+SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test
utils abi6-compat abi7-compat +abi8-compat"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+ numpy? ( python )
+ ^^ ( abi6-compat abi7-compat abi8-compat )
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+ dev-cpp/tbb
+ dev-libs/boost:=
+ dev-libs/c-blosc:=
+ dev-libs/jemalloc:=
+ dev-libs/log4cplus:=
+ media-libs/glfw
+ media-libs/glu
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ sys-libs/zlib:=
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
+ numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
+ ')
+ )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+ test? ( dev-util/cppunit dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local myprefix="${EPREFIX}/usr/"
+
+ local version
+ if use abi6-compat; then
+ version=6
+ elif use abi7-compat; then
+ version=7
+ elif use abi8-compat; then
+ version=8
+ else
+ die "Openvdb abi version is not compatible"
+ fi
+
+ local mycmakeargs=(
+ -DCHOST="${CHOST}"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/
commit: d2da0328cf5f3819d72d617577a2122af02fbf6c
Author: Sebastian Parborg gmail com>
AuthorDate: Wed Apr 28 00:33:14 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2da0328
media-libs/opencolorio: bump to 2.0.0
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-libs/opencolorio/Manifest | 1 +
media-libs/opencolorio/opencolorio-2.0.0.ebuild | 99 +
2 files changed, 100 insertions(+)
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index c7ac45d7ec9..c961e5e5010 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1 +1,2 @@
DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B
f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf
SHA512
bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
+DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B
fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3
SHA512
7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
diff --git a/media-libs/opencolorio/opencolorio-2.0.0.ebuild
b/media-libs/opencolorio/opencolorio-2.0.0.ebuild
new file mode 100644
index 000..8ae78845721
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.0.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org/;
+
+if [[ ${PV} = * ]]; then
+ inherit git-r3
+
EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO.git;
+else
+
SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/OpenColorIO-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+ doc? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-cpp/pystring
+ dev-python/pybind11
+ media-libs/ilmbase
+ >=dev-cpp/yaml-cpp-0.5
+ dev-libs/tinyxml
+ opengl? (
+ media-libs/lcms:2
+ >=media-libs/openimageio-2.2.13.0
+ media-libs/glew:=
+ media-libs/freeglut
+ virtual/opengl
+ )
+ python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
+ virtual/pkgconfig
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="mirror test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION
$(get_libdir)|g"
{,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt
|| die
+ sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION
$(get_libdir)|g"
{,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt
|| die
+}
+
+src_configure() {
+ # Missing features:
+ # - Truelight and Nuke are not in portage for now, so their support are
disabled
+ # - Java bindings was not tested, so disabled
+ # Notes:
+ # - OpenImageIO is required for building ociodisplay and ocioconvert
(USE opengl)
+ # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE
opengl)
+ local mycmakeargs=(
+ -DOCIO_BUILD_NUKE=OFF
+ -DBUILD_SHARED_LIBS=ON
+ -DOCIO_BUILD_STATIC=$(usex static-libs)
+ -DOCIO_BUILD_DOCS=$(usex doc)
+ -DOCIO_BUILD_APPS=$(usex opengl)
+ -DOCIO_BUILD_PYTHON=$(usex python)
+ -DOCIO_BUILD_JAVA=OFF
+ -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+ -DOCIO_BUILD_TESTS=$(usex test)
+ -DOCIO_BUILD_GPU_TESTS=$(usex test)
+ -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+ -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ )
+
+ # We need this to work around asserts that can trigger even in proper
use cases.
+ # See
https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+ append-flags -DNDEBUG
+
+ cmake_src_configure
+}
[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/
commit: a8f956e915b79218d56b4af2cb3015b0869c3aaa
Author: Sebastian Parborg gmail com>
AuthorDate: Tue Apr 27 23:55:19 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f956e9
media-libs/oidn: New package
Intel Open Image Denoise is an open source library of high-performance,
high-quality denoising filters for images rendered with ray tracing.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
media-libs/oidn/Manifest | 1 +
media-libs/oidn/metadata.xml | 20
media-libs/oidn/oidn-1.3.0.ebuild | 39 +++
3 files changed, 60 insertions(+)
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
new file mode 100644
index 000..d2d55abdbfb
--- /dev/null
+++ b/media-libs/oidn/Manifest
@@ -0,0 +1 @@
+DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
SHA512
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
diff --git a/media-libs/oidn/metadata.xml b/media-libs/oidn/metadata.xml
new file mode 100644
index 000..1787e6d6af0
--- /dev/null
+++ b/media-libs/oidn/metadata.xml
@@ -0,0 +1,20 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ darkdefe...@gmail.com
+ Sebastian Parborg
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+
+ Intel Open Image Denoise is an open source library of
high-performance,
+ high-quality denoising filters for images rendered with ray
tracing. Intel
+ Open Image Denoise is part of the Intel® oneAPI Rendering
Toolkit and is
+
+
+ OpenImageDenoise/oidn
+
+
diff --git a/media-libs/oidn/oidn-1.3.0.ebuild
b/media-libs/oidn/oidn-1.3.0.ebuild
new file mode 100644
index 000..7e79c737d50
--- /dev/null
+++ b/media-libs/oidn/oidn-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+
+inherit cmake python-single-r1 eutils
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="http://www.openimagedenoise.org/;
+
+if [[ ${PV} = * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git;
+ EGIT_BRANCH="master"
+else
+
SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/tbb
+ dev-lang/ispc"
+DEPEND="
+ ${RDEPEND}
+ dev-util/cmake"
+
+CMAKE_BUILD_TYPE=Release
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/pystring/
commit: b0aa532afd2954423184d67f407a1e866613b0f2
Author: Sebastian Parborg gmail com>
AuthorDate: Mon May 17 09:03:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 10 00:19:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0aa532a
dev-cpp/pystring: New package
Pystring is a collection of C++ functions which match the interface and
behavior of python's string class methods using std::string. Implemented
in C++, it does not require or make use of a python interpreter. It
provides convenience and familiarity for common string operations not
included in the standard C++ library. It's also useful in environments
where both C++ and python are used.
Signed-off-by: Sebastian Parborg gmail.com>
Signed-off-by: Sam James gentoo.org>
dev-cpp/pystring/Manifest | 1 +
dev-cpp/pystring/metadata.xml | 15 ++
dev-cpp/pystring/pystring-1.1.3.ebuild | 38 ++
3 files changed, 54 insertions(+)
diff --git a/dev-cpp/pystring/Manifest b/dev-cpp/pystring/Manifest
new file mode 100644
index 000..eb3773a17b3
--- /dev/null
+++ b/dev-cpp/pystring/Manifest
@@ -0,0 +1 @@
+DIST pystring-1.1.3.tar.gz 18364 BLAKE2B
caab1a3b1dc688ad6ecbb32e5e8139bb883a88b78ce8a021229924d57376e94b17d89277e2fccf4f7ec478c81ee9259c5e56848f4388c44b2eab9cfb841bcfb8
SHA512
a46bb2e96d6eb351a4a8097cde46ac2877d28e88f9e57e0ac36c42e8fc8543517c4be70306a01e2f88a891fc53c612494aeb37f47a200d94b8e1b050ed16eff6
diff --git a/dev-cpp/pystring/metadata.xml b/dev-cpp/pystring/metadata.xml
new file mode 100644
index 000..1ce859e3e5b
--- /dev/null
+++ b/dev-cpp/pystring/metadata.xml
@@ -0,0 +1,15 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ darkdefe...@gmail.com
+ Sebastian Parborg
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+
+ imageworks/pystring
+
+
diff --git a/dev-cpp/pystring/pystring-1.1.3.ebuild
b/dev-cpp/pystring/pystring-1.1.3.ebuild
new file mode 100644
index 000..78410abecfd
--- /dev/null
+++ b/dev-cpp/pystring/pystring-1.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ functions matching the interface and behavior of python
string methods"
+HOMEPAGE="https://github.com/imageworks/pystring;
+
+if [[ "${PV}" == "" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/imageworks/pystring.git;
+else
+ SRC_URI="https://github.com/imageworks/pystring/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+BDEPEND="
+ virtual/libc
+ sys-devel/libtool
+"
+RESTRICT="mirror"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+
+src_compile() {
+ sed -i -e "s|-O3|${CXXFLAGS}|g" Makefile || die
+ emake LIBDIR="${S}" install
+
+ # Fix header location
+ mkdir ${S}/pystring || die
+ mv ${S}/pystring.h ${S}/pystring || die
+}
+
+src_install() {
+ dolib.so ${S}/libpystring.so{,.0{,.0.0}}
+ doheader -r ${S}/pystring
+}
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/targets/, catalyst/
commit: f535f7c03185442359ab1c5381205de736f547ea
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 06:17:31 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jun 10 00:40:14 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f535f7c0
catalyst: Replace snakeoil's locks with fasteners
To no great surprise, the existing locking was broken. For example,
clear_chroot() releases the lock. It is called by unpack(), which is
part of prepare_sequence. The result is that the whole build could be
done without holding the lock.
Just lock around run(). It's not apparent that finer-grained locking
does anything for us.
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/clearbase.py | 2 --
catalyst/base/stagebase.py | 8 +-
catalyst/lock.py | 58
catalyst/targets/snapshot.py | 6 ++---
4 files changed, 4 insertions(+), 70 deletions(-)
diff --git a/catalyst/base/clearbase.py b/catalyst/base/clearbase.py
index dcf6c523..6218330e 100644
--- a/catalyst/base/clearbase.py
+++ b/catalyst/base/clearbase.py
@@ -27,12 +27,10 @@ class ClearBase():
self.resume.clear_all(remove=True)
def clear_chroot(self):
-self.chroot_lock.unlock()
log.notice('Clearing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755)
def remove_chroot(self):
-self.chroot_lock.unlock()
log.notice('Removing the chroot path ...')
clear_dir(self.settings["chroot_path"], mode=0o755, remove=True)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 448d6265..fac5d790 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -25,7 +25,6 @@ from catalyst.support import (CatalystError, file_locate,
normpath,
from catalyst.base.targetbase import TargetBase
from catalyst.base.clearbase import ClearBase
from catalyst.base.genbase import GenBase
-from catalyst.lock import LockDir, LockInUse
from catalyst.fileops import ensure_dirs, clear_dir, clear_path
from catalyst.base.resume import AutoResume
@@ -36,9 +35,6 @@ def run_sequence(sequence):
sys.stdout.flush()
try:
func()
-except LockInUse:
-log.error('Unable to aquire the lock...')
-return False
except Exception:
log.error('Exception running action sequence %s',
func.__name__, exc_info=True)
@@ -478,7 +474,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
"""
self.settings["chroot_path"] = normpath(self.settings["storedir"] +
"/tmp/" +
self.settings["target_subpath"].rstrip('/'))
-self.chroot_lock = LockDir(self.settings["chroot_path"])
def set_autoresume_path(self):
self.settings["autoresume_path"] = normpath(pjoin(
@@ -1365,9 +1360,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
except CatalystError:
pass
+@fasteners.interprocess_locked(self.chroot_path + '.lock')
def run(self):
-self.chroot_lock.write_lock()
-
if "clear-autoresume" in self.settings["options"]:
self.clear_autoresume()
diff --git a/catalyst/lock.py b/catalyst/lock.py
deleted file mode 100644
index e31745b2..
--- a/catalyst/lock.py
+++ /dev/null
@@ -1,58 +0,0 @@
-
-import os
-
-from contextlib import contextmanager
-
-from snakeoil import fileutils
-from snakeoil import osutils
-from catalyst.fileops import ensure_dirs
-
-
-LockInUse = osutils.LockException
-
-class Lock:
-"""
-A fnctl-based filesystem lock
-"""
-def __init__(self, lockfile):
-fileutils.touch(lockfile, mode=0o664)
-os.chown(lockfile, uid=-1, gid=250)
-self.lock = osutils.FsLock(lockfile)
-
-def read_lock(self):
-self.lock.acquire_read_lock()
-
-def write_lock(self):
-self.lock.acquire_write_lock()
-
-def unlock(self):
-# Releasing a write lock is the same as a read lock.
-self.lock.release_write_lock()
-
-class LockDir(Lock):
-"""
-A fnctl-based filesystem lock in a directory
-"""
-def __init__(self, lockdir):
-ensure_dirs(lockdir)
-lockfile = os.path.join(lockdir, '.catalyst_lock')
-
-Lock.__init__(self, lockfile)
-
-@contextmanager
-def read_lock(filename):
-lock = Lock(filename)
-lock.read_lock()
-try:
-yield
-finally:
-lock.unlock()
-
-@contextmanager
-def write_lock(filename):
-lock = Lock(filename)
-lock.write_lock()
-try:
-yield
-finally:
-lock.unlock()
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index b494575a..ef68765d 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -5,11 +5,12 @@ Snapshot target
import subprocess
import sys
+import fasteners
+
from pathlib import Path
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/targets/
commit: 6b78a58c9ac825ecd450d100cd269d29761dbe03
Author: Daniel Cordero 0xdc io>
AuthorDate: Thu Feb 4 11:07:18 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Feb 21 02:05:34 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6b78a58c
catalyst: Clean up chroot directory on success
The embedded and livecd-stage2 targets override the action sequence
without calling set_completion_action_sequences. This would leave the
temporary build environment unpacked on the filesystem.
Signed-off-by: Daniel Cordero 0xdc.io>
Signed-off-by: Matt Turner gentoo.org>
catalyst/targets/embedded.py | 2 +-
catalyst/targets/livecd_stage2.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py
index b677b226..01ad035d 100644
--- a/catalyst/targets/embedded.py
+++ b/catalyst/targets/embedded.py
@@ -53,8 +53,8 @@ class embedded(StageBase):
self.empty,
self.clean,
self.capture,
-self.clear_autoresume,
])
+self.set_completion_action_sequences()
def set_root_path(self):
self.settings["root_path"] = normpath("/tmp/mergeroot")
diff --git a/catalyst/targets/livecd_stage2.py
b/catalyst/targets/livecd_stage2.py
index 774702f8..832e0998 100644
--- a/catalyst/targets/livecd_stage2.py
+++ b/catalyst/targets/livecd_stage2.py
@@ -108,4 +108,4 @@ class livecd_stage2(StageBase):
self.setup_overlay,
self.create_iso,
])
-self.finish_sequence.append(self.clear_autoresume)
+self.set_completion_action_sequences()
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/
commit: 4fd2ac23250ab2ac1f6a506ee433f466a4f9e026 Author: Felix Bier rohde-schwarz com> AuthorDate: Sat Feb 13 23:18:17 2021 + Commit: Matt Turner gentoo org> CommitDate: Sat Feb 20 21:27:29 2021 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4fd2ac23 Enable recursive globbing for clear_path This commit enables recursive globbing in clear_path, allowing the usage of '**' to match an arbitrary number of sub-directories. Before this commit, clear_path used only non-recursive globbing. This allowed to use '*' to expand names within one directory, e.g. '/a/*/c' can expand to '/a/b/c', but not '/a/b/b/c'. With this commit, '/a/**/c' can be used to expand to '/a/b/c', '/a/b/b/c', '/a/b/b/b/c' etc. This is motivated by wanting to recursively delete all occurences of a filename with the 'stage4/rm' entry of a spec file. The '/rm' entries are processed with 'clear_path' in the existing code. Additionally, 'glob.glob' is replaced with 'glob.iglob', which returns the same files as 'glob.glob', but as an iterator instead of as a list (so it no longer necessary to hold all matches in memory at once). Recursive globbing has been added in Python 3.5. References: https://docs.python.org/3/library/glob.html#glob.glob https://docs.python.org/3/library/glob.html#glob.iglob Signed-off-by: Felix Bier rohde-schwarz.com> Signed-off-by: Matt Turner gentoo.org> catalyst/fileops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/fileops.py b/catalyst/fileops.py index 5c6f5cd8..59525420 100644 --- a/catalyst/fileops.py +++ b/catalyst/fileops.py @@ -99,7 +99,7 @@ def clear_dir(target, mode=0o755, remove=False, def clear_path(target_path): """Nuke |target_path| regardless of it being a dir, file or glob.""" -targets = glob.glob(target_path) +targets = glob.iglob(target_path, recursive=True) for path in targets: clear_dir(path, remove=True)
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
commit: 71037a931ff23141875c40d37605e8614a31077e
Author: Daniel Cordero 0xdc io>
AuthorDate: Thu Feb 25 13:09:12 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Mar 6 16:57:09 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=71037a93
catalyst: Handle specifying target_profiles in repo_name:path format
Fixes: a5004005 ("catalyst: Call config_profile_link for all targets")
Signed-off-by: Daniel Cordero 0xdc.io>
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index a4da7eb3..448d6265 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -814,10 +814,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
make_profile = Path(self.settings['chroot_path'] +
self.settings['port_conf'],
'make.profile')
make_profile.unlink(missing_ok=True)
+try:
+repo_name, target_profile =
self.settings['target_profile'].split(":", 1)
+except ValueError:
+repo_name = self.settings['repo_name']
+target_profile = self.settings['target_profile']
make_profile.symlink_to(Path('../..' + self.settings['repo_basedir'],
- self.settings['repo_name'],
+ repo_name,
'profiles',
- self.settings['target_profile']),
+ target_profile),
target_is_directory=True)
def setup_confdir(self):
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/
commit: fbe56d75989fabf29e7b642515df69737cf62cc1
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 04:32:08 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Jun 9 04:32:08 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fbe56d75
catalyst: Remove clear_dir's never used clear_nondir parameter
Signed-off-by: Matt Turner gentoo.org>
catalyst/fileops.py | 11 +++
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/catalyst/fileops.py b/catalyst/fileops.py
index 59525420..4252285e 100644
--- a/catalyst/fileops.py
+++ b/catalyst/fileops.py
@@ -46,8 +46,7 @@ def ensure_dirs(path, gid=-1, uid=-1, mode=0o755,
minimal=True,
return succeeded
-def clear_dir(target, mode=0o755, remove=False,
- clear_nondir=True):
+def clear_dir(target, mode=0o755, remove=False):
'''Universal directory clearing function
@target: string, path to be cleared or removed
@@ -74,12 +73,8 @@ def clear_dir(target, mode=0o755, remove=False,
log.error('clear_dir failed', exc_info=True)
return False
elif os.path.exists(target):
-if clear_nondir:
-log.debug("Clearing (unlinking) non-directory: %s", target)
-os.unlink(target)
-else:
-log.info('clear_dir failed: %s: is not a directory', target)
-return False
+log.debug("Clearing (unlinking) non-directory: %s", target)
+os.unlink(target)
else:
log.debug("Conditions not met to clear: %s", target)
log.debug(" isdir: %s", os.path.isdir(target))
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
commit: dc22f3540c6879e88e5f3bd2ff8999066387d3ea
Author: Matt Turner gentoo org>
AuthorDate: Thu Mar 25 03:02:39 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Mar 25 03:02:39 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dc22f354
catalyst: Fix indentation
Fixes: 48338534 ("Add option to generate BSD-style tagged hashes ...")
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/genbase.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 4a4c3efa..b89e7c93 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -26,9 +26,9 @@ class GenBase():
filename = os.path.split(filepath)[1]
if self.settings['digest_format'] == 'bsd':
-return f'# {name.upper()} HASH\n{name.upper()} ({filename}) =
{h.hexdigest()}\n'
+return f'# {name.upper()} HASH\n{name.upper()} ({filename}) =
{h.hexdigest()}\n'
else:
-return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
+return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
def gen_contents_file(self, path):
c = self.settings['contents_map']
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/, catalyst/base/
commit: 483385348b32fab2230f596816b6e1d0b6489962
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Feb 24 21:26:58 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Feb 24 21:26:58 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=48338534
Add option to generate BSD-style tagged hashes (can be verified by modern
coreutils)
Signed-off-by: Andreas K. Hüttel gentoo.org>
catalyst/base/genbase.py | 6 +-
catalyst/defaults.py | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index c7dd87bc..52418877 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -24,7 +24,11 @@ class GenBase():
h.update(data)
filename = os.path.split(filepath)[1]
-return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
+
+ if self.settings['digest_format'] == 'bsd':
+ return f'# {name.upper()} HASH\n{name.upper()} ({filename}) =
{h.hexdigest()}\n'
+ else:
+ return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
def gen_contents_file(self, path):
c = self.settings['contents_map']
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index ccb0a584..2cede562 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -11,6 +11,7 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS,
LIST_XATTRS_OPTIONS
valid_config_file_values = frozenset([
"compression_mode",
"digests",
+"digest_format",
"distcc_hosts",
"distdir",
"envscript",
@@ -35,6 +36,7 @@ confdefaults = {
"compressor_options": XATTRS_OPTIONS['linux'],
"decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'],
"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER,
+"digest_format": 'linux',
"distdir": portage.settings['DISTDIR'],
"icecream": "/var/cache/icecream",
'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'],
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
commit: 5f34226550e221921189ca2184a0afe2de1e8821
Author: Felix Bier rohde-schwarz com>
AuthorDate: Thu Feb 4 00:45:27 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 20 21:27:29 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5f342265
Drop PORTDIR from make.conf
This commit drops PORTDIR from being included in the generated
make.conf. The variable is no longer needed, since the existing code
will now generate a repos.conf entry for the main repo when needed
(i.e. when the location is non-default, which is the same condition
that was applied for PORTDIR in the code removed by this commit).
The PORTDIR variable is considered deprecated in favor of
repos.conf entries (reference: https://wiki.gentoo.org/wiki/PORTDIR).
Signed-off-by: Felix Bier rohde-schwarz.com>
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 6 --
1 file changed, 6 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 97e2318c..bc0eccd0 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1092,12 +1092,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
myf.write(hostuseexpand + '="' +
' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
-# Write non-default PORTDIR/DISTDIR/PKGDIR settings to make.conf
-if (self.settings['repo_basedir'], self.settings['repo_name']) != \
- (confdefaults['repo_basedir'], confdefaults['repo_name']):
-myf.write('PORTDIR="%s/%s"\n' % (self.settings['repo_basedir'],
- self.settings['repo_name']))
-
for x in ['target_distdir', 'target_pkgdir']:
if self.settings[x] != confdefaults[x]:
varname = x.split('_')[1].upper()
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
commit: 7c4d1c5f3aab4a32795797332f33d5a759f72a9d
Author: Matt Turner gentoo org>
AuthorDate: Thu Mar 25 03:02:53 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Mar 25 03:02:53 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7c4d1c5f
catalyst: Remove @staticmethod from generate_hash()
Fixes: 48338534 ("Add option to generate BSD-style tagged hashes ...")
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/genbase.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index b89e7c93..6d039a8f 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -12,8 +12,7 @@ class GenBase():
def __init__(self, myspec):
self.settings = myspec
-@staticmethod
-def generate_hash(filepath, name):
+def generate_hash(self, filepath, name):
h = hashlib.new(name)
with open(filepath, 'rb') as f:
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
commit: 91dba2e6199b24c7d0b52b8bd6204b4a5f6e5137
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 9 16:17:33 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 9 16:17:33 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=91dba2e6
catalyst: Remove tabs
Fixes: 48338534 ("Add option to generate BSD-style tagged hashes ...")
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/genbase.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py
index 52418877..4a4c3efa 100644
--- a/catalyst/base/genbase.py
+++ b/catalyst/base/genbase.py
@@ -25,10 +25,10 @@ class GenBase():
filename = os.path.split(filepath)[1]
- if self.settings['digest_format'] == 'bsd':
- return f'# {name.upper()} HASH\n{name.upper()} ({filename}) =
{h.hexdigest()}\n'
- else:
- return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
+if self.settings['digest_format'] == 'bsd':
+return f'# {name.upper()} HASH\n{name.upper()} ({filename}) =
{h.hexdigest()}\n'
+else:
+return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n'
def gen_contents_file(self, path):
c = self.settings['contents_map']
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/
commit: 42332a642def9a8d454246da68955172442e7aa5
Author: Daniel Cordero 0xdc io>
AuthorDate: Thu Feb 4 11:07:21 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Feb 21 02:05:44 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=42332a64
targets: Use the correct distcc libdir
Since distcc-3.3 (and bug 651030) distcc symlinks have been installed to
/usr/lib/distcc/bin/ regardless of get_libdir.
Signed-off-by: Daniel Cordero 0xdc.io>
Signed-off-by: Matt Turner gentoo.org>
targets/support/chroot-functions.sh | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index 88465c31..d8472d46 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -83,11 +83,10 @@ setup_features() {
# This sets up automatic cross-distcc-fu according to
# https://wiki.gentoo.org/wiki/Distcc/Cross-Compiling
CHOST=$(portageq envvar CHOST)
- LIBDIR=$(get_libdir)
- cd /usr/${LIBDIR}/distcc/bin
+ cd /usr/lib/distcc/bin
rm cc gcc g++ c++ 2>/dev/null
- echo -e '#!/bin/bash\nexec
/usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
- chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper
+ echo -e '#!/bin/bash\nexec
/usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+ chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
fi
@@ -171,13 +170,12 @@ setup_gcc(){
}
cleanup_distcc() {
- LIBDIR=$(get_libdir)
- rm -rf /etc/distcc/hosts
+ rm -f /etc/distcc/hosts
for i in cc gcc c++ g++; do
- rm -f /usr/${LIBDIR}/distcc/bin/${i}
- ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i}
+ rm -f /usr/lib/distcc/bin/${i}
+ ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
done
- rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper
+ rm -f /usr/lib/distcc/bin/*-wrapper
}
cleanup_icecream() {
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/
commit: c1f5707a9c9f27f730aad908c8f3c86075201fc9 Author: Daniel Cordero 0xdc io> AuthorDate: Thu Feb 4 11:07:19 2021 + Commit: Matt Turner gentoo org> CommitDate: Sun Feb 21 02:05:39 2021 + URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c1f5707a catalyst: Remove /etc/machine-id in all stages Machine IDs are unique per installation, but if they are retained in a stage tarball, all installations from that stage share the same machine id. Signed-off-by: Daniel Cordero 0xdc.io> Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 1 + 1 file changed, 1 insertion(+) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index bc0eccd0..a4da7eb3 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -465,6 +465,7 @@ class StageBase(TargetBase, ClearBase, GenBase): def set_cleanables(self): self.settings['cleanables'] = [ +"/etc/machine-id", "/etc/resolv.conf", "/var/tmp/*", "/tmp/*",
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: doc/, catalyst/targets/, catalyst/
commit: d5f85bc8d71d89920332ce760e5da3dca257dc36
Author: Felix Bier rohde-schwarz com>
AuthorDate: Thu Feb 4 00:34:14 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 20 02:27:06 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d5f85bc8
Rename config option 'repos' -> 'repos_storedir'
This commit renames the config option 'repos' to 'repos_storedir'.
This is done as preparation for renaming 'portage_overlay' to 'repos'.
Signed-off-by: Felix Bier rohde-schwarz.com>
Signed-off-by: Matt Turner gentoo.org>
catalyst/defaults.py | 4 ++--
catalyst/targets/snapshot.py | 2 +-
doc/catalyst-config.5.txt| 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 3f12b8d5..3d5c0a7f 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -20,7 +20,7 @@ valid_config_file_values = frozenset([
"port_logdir",
"repo_basedir",
"repo_name",
-"repos",
+"repos_storedir",
"sharedir",
"storedir",
"target_distdir",
@@ -46,7 +46,7 @@ confdefaults = {
"port_tmpdir": "/var/tmp/portage",
"repo_basedir": "/var/db/repos",
"repo_name": "gentoo",
-"repos": "%(storedir)s/repos",
+"repos_storedir": "%(storedir)s/repos",
"sharedir": "/usr/share/catalyst",
"shdir": "%(sharedir)s/targets",
"storedir": "/var/tmp/catalyst",
diff --git a/catalyst/targets/snapshot.py b/catalyst/targets/snapshot.py
index 6b727600..b494575a 100644
--- a/catalyst/targets/snapshot.py
+++ b/catalyst/targets/snapshot.py
@@ -27,7 +27,7 @@ class snapshot(TargetBase):
TargetBase.__init__(self, myspec, addlargs)
self.git = command('git')
-self.ebuild_repo = Path(self.settings['repos'],
+self.ebuild_repo = Path(self.settings['repos_storedir'],
self.settings['repo_name']).with_suffix('.git')
self.gitdir = str(self.ebuild_repo)
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 570d42c2..ebd99b55 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -109,7 +109,7 @@ Repository settings
Defines the location of your local source file repository.
Defaults to the host's DISTDIR.
-*repos*::
+*repos_storedir*::
The directory in which git repositories exist for use by the snapshot target.
Defaults to `${storedir}/repos`.
@@ -120,7 +120,7 @@ gentoo repo) and any overlays. The default location is
*repo_name*::
The name of the main repository (e.g. gentoo). The git repository at
-`${repos}/${repo_name}.git` will be used to produce the portdir sqfs
+`${repos_storedir}/${repo_name}.git` will be used to produce the portdir sqfs
snapshot.
*target_distdir*::
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/
commit: caf55a942580e02e66ed846f5c3ab4ad5ab8846f
Author: Felix Bier rohde-schwarz com>
AuthorDate: Thu Feb 4 00:37:06 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 20 21:27:29 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=caf55a94
Extend get_repo_name to handle squashed repos
This commit extends the method get_repo_name to also handle
squashed repos. This is done by mounting the squash file to
a temporary directory and then extracting the repository from
that directory with the already existing code.
This is motivated by wanting to mount each repo
to e.g. /var/db/repos/ in a later commit.
For squashed repos, we don't know without
mounting the repo first. For this reason, it is mounted to
a temporary directory first to extract .
Signed-off-by: Felix Bier rohde-schwarz.com>
Signed-off-by: Matt Turner gentoo.org>
catalyst/support.py | 36 +++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/catalyst/support.py b/catalyst/support.py
index fc50fa34..37d53bc4 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -10,10 +10,12 @@ from subprocess import Popen
import libmount
from portage.repository.config import RepoConfig
+from tempfile import TemporaryDirectory
from snakeoil.bash import read_bash_dict
from catalyst import log
+from catalyst.context import namespace
BASH_BINARY = "/bin/bash"
@@ -148,7 +150,7 @@ def read_makeconf(mymakeconffile):
return makeconf
-def get_repo_name(repo_path):
+def get_repo_name_from_dir(repo_path):
""" Get the name of the repo at the given repo_path.
References:
@@ -164,6 +166,38 @@ def get_repo_name(repo_path):
return repo_config.name
+def get_repo_name_from_squash(repo_squash_path):
+""" Get the name of the repo at the given repo_squash_path.
+To obtain the name, the squash file is mounted to a temporary
directory.
+"""
+
+repo_name = None
+
+# Mount squash file to temp directory in separate mount namespace
+with TemporaryDirectory() as temp, namespace(mount=True):
+try:
+source = str(repo_squash_path)
+target = str(temp)
+fstype = 'squashfs'
+options = 'ro,loop'
+cxt = libmount.Context(source=source, target=target,
+ fstype=fstype, options=options)
+cxt.mount()
+repo_name = get_repo_name_from_dir(target)
+
+except Exception as e:
+raise CatalystError(f"Couldn't mount: {source}, {e}") from e
+
+return repo_name
+
+
+def get_repo_name(repo_path):
+if not Path(repo_path).is_dir():
+return get_repo_name_from_squash(repo_path)
+
+return get_repo_name_from_dir(repo_path)
+
+
def ismount(path):
"""Like os.path.ismount, but also support bind mounts"""
path = Path(path)
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: doc/, examples/, catalyst/targets/, catalyst/base/
commit: 25a7af61391e3fa8af77beec26c95b03175342d9
Author: Felix Bier rohde-schwarz com>
AuthorDate: Thu Feb 4 00:35:52 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 20 02:27:06 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=25a7af61
Rename config option 'portage_overlay' -> 'repos'
This commit renames the config option 'portage_overlay' to 'repos'.
Also, it renames the method 'portage_overlay' to 'process_repos'
and 'set_portage_overlay' to 'set_repos'. Motivation:
1) The Gentoo wiki states 'repository' as the preferred term,
and 'overlay' only as a colloquial
(https://wiki.gentoo.org/wiki/Ebuild_repository),
reducing the distinction between the main repository
and other 'overlay' repositories.
3) This avoids confusion with filesystem overlays
(via the config option 'overlay' and 'root_overlay').
2) The plural form highlights the possibility of specifying
multiple repositories, continuing 2861038a.
Signed-off-by: Felix Bier rohde-schwarz.com>
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 30 +++---
catalyst/targets/livecd_stage2.py| 2 +-
catalyst/targets/stage1.py | 6 +++---
catalyst/targets/stage2.py | 6 +++---
catalyst/targets/stage3.py | 6 +++---
catalyst/targets/stage4.py | 2 +-
doc/catalyst-config.5.txt| 2 +-
doc/catalyst-spec.5.txt | 2 +-
examples/generic_stage_template.spec | 4 ++--
examples/livecd-stage1_template.spec | 4 ++--
examples/livecd-stage2_template.spec | 4 ++--
examples/netboot_template.spec | 4 ++--
examples/stage4_template.spec| 4 ++--
13 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 46cb1fda..fedc8f87 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -81,14 +81,14 @@ class StageBase(TargetBase, ClearBase, GenBase):
"ldflags",
"pkgcache_path",
"portage_confdir",
-"portage_overlay",
+"repos",
"portage_prefix",
])
self.prepare_sequence = [
self.unpack,
self.config_profile_link,
self.setup_confdir,
-self.portage_overlay,
+self.process_repos,
]
self.build_sequence = [
self.bind,
@@ -206,7 +206,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.set_linuxrc()
self.set_busybox_config()
self.set_overlay()
-self.set_portage_overlay()
+self.set_repos()
self.set_root_overlay()
# This next line checks to make sure that the specified variables
exist on disk.
@@ -586,13 +586,13 @@ class StageBase(TargetBase, ClearBase, GenBase):
del self.settings[self.settings["spec_prefix"] +
"/busybox_config"]
-def set_portage_overlay(self):
-if "portage_overlay" in self.settings:
-if isinstance(self.settings['portage_overlay'], str):
-self.settings["portage_overlay"] = \
-self.settings["portage_overlay"].split()
-log.info('portage_overlay directories are set to: %s',
- ' '.join(self.settings['portage_overlay']))
+def set_repos(self):
+if 'repos' in self.settings:
+if isinstance(self.settings['repos'], str):
+self.settings['repos'] = \
+self.settings['repos'].split()
+log.info('repos directories are set to: %s',
+ ' '.join(self.settings['repos']))
def set_overlay(self):
if self.settings["spec_prefix"] + "/overlay" in self.settings:
@@ -831,10 +831,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
except OSError as e:
raise CatalystError(f'Could not write {repo_conf_chroot}: {e}')
from e
-def portage_overlay(self):
+def process_repos(self):
""" We copy the contents of our repos to get_repo_location(repo_name)
"""
-if "portage_overlay" in self.settings:
-for x in self.settings["portage_overlay"]:
+if 'repos' in self.settings:
+for x in self.settings['repos']:
if os.path.exists(x):
name = get_repo_name(x)
@@ -1145,8 +1145,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
clear_path(target)
# Remove our overlays
-if "portage_overlay" in self.settings:
-for repo_path in self.settings["portage_overlay"]:
+if 'repos' in self.settings:
+for repo_path in self.settings['repos']:
repo_name = get_repo_name(repo_path)
repo_conf = self.get_repo_conf_path(repo_name)
diff --git a/catalyst/targets/livecd_stage2.py
[gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, catalyst/
commit: 65d49f1028b49fed6e011526429e553ebb6c903e
Author: Felix Bier rohde-schwarz com>
AuthorDate: Thu Feb 4 00:38:36 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 20 21:27:29 2021 +
URL:https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=65d49f10
Unify handling of main repo and other repos
This commit unifies the handling of the main repo and the other repos.
All are stored in one common list. A mount entry is created for
each entry in the list (previously a mount entry was only created
for the main repo and the other repos were copied into the chroot).
This means each non-main repo can now be either a directory or a
squash files (previously the non-main repos had to be directories).
The existing mount logic will bind-mount the repos that are stored as
directories, removing the need for copying.
A repos.conf entry will be created for each entry in the list.
This means a repos.conf entry for the main repo can now be created
(previously repos.conf entries were only created for the non-main
repos). The repos.conf entry will only be created if the target
location for the main repo is non-default, i.e. unequal to
/var/db/repos/gentoo. This mirrors the behavior of write_make_conf,
which only writes the PORTDIR variable to make.conf if the location
of the main repo is non-default.
As a side effect, the PORTDIR variable is now no longer needed,
and will be removed from write_make_conf in a separate commit.
Signed-off-by: Felix Bier rohde-schwarz.com>
Signed-off-by: Matt Turner gentoo.org>
catalyst/base/stagebase.py | 88 +++---
catalyst/defaults.py | 5 ---
2 files changed, 60 insertions(+), 33 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index fedc8f87..97e2318c 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -219,8 +219,17 @@ class StageBase(TargetBase, ClearBase, GenBase):
# Setup our mount points.
self.mount = copy.deepcopy(MOUNT_DEFAULTS)
-self.mount['portdir']['source'] = self.snapshot
-self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/'
+ self.settings['repo_name']
+# Create mount entry for each repository
+for path, name, _ in self.repos:
+name = get_repo_name(path)
+mount_id = f'repo_{name}'
+
+self.mount[mount_id] = {
+'enable': True,
+'source': path,
+'target': self.get_repo_location(name)
+}
+
self.mount['distdir']['source'] = self.settings['distdir']
self.mount["distdir"]['target'] = self.settings['target_distdir']
@@ -587,13 +596,41 @@ class StageBase(TargetBase, ClearBase, GenBase):
"/busybox_config"]
def set_repos(self):
+
+# Each entry in this list will be a tuple of the form
+# (source, name, default)
+#
+# source: the location of the repo on the host system,
+# either a directory or a squashfs file.
+#
+# name: the repository name parsed from the repo.
+# This is just a caching mechanism to avoid parsing the name
+# every time the source is processed.
+#
+# default: Default location where the repo is expected in the
+# target system. If this matches the path where we mount the repo to
+# (as per get_repo_location), then we can skip generating a repos.conf
+# entry for that repo. Currently this mechanism is only used for
+# the main repo, which has a default location hard-coded in
+# /usr/share/portage/config/repos.conf. For the other repos,
+# the default is set to None.
+self.repos = []
+
+# Create entry for snapshot
+default_location = Path(confdefaults['repo_basedir'],
confdefaults['repo_name'])
+self.repos.append((self.snapshot, get_repo_name(self.snapshot),
default_location))
+
+# Create entry for every other repo
if 'repos' in self.settings:
if isinstance(self.settings['repos'], str):
self.settings['repos'] = \
self.settings['repos'].split()
-log.info('repos directories are set to: %s',
+log.info('repos are set to: %s',
' '.join(self.settings['repos']))
+get_info = lambda repo: (repo, get_repo_name(repo), None)
+self.repos.extend(map(get_info, self.settings['repos']))
+
def set_overlay(self):
if self.settings["spec_prefix"] + "/overlay" in self.settings:
if isinstance(self.settings[self.settings['spec_prefix'] +
'/overlay'], str):
@@ -832,24 +869,19 @@ class StageBase(TargetBase, ClearBase, GenBase):
raise CatalystError(f'Could not write {repo_conf_chroot}: {e}')
from e
def process_repos(self):
-""" We copy the contents of our repos to
[gentoo-commits] proj/gentoo-mate:master commit in: x11-themes/mate-themes/
commit: 26cb44ae28e72a3034da50dd7853905ede2ad82d
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:20:19 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:20:19 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=26cb44ae
x11-themes/mate-themes: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
x11-themes/mate-themes/Manifest | 1 -
x11-themes/mate-themes/mate-themes-3.22.19.ebuild | 38 ---
2 files changed, 39 deletions(-)
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
index 64732a7..e0262bc 100644
--- a/x11-themes/mate-themes/Manifest
+++ b/x11-themes/mate-themes/Manifest
@@ -1,2 +1 @@
-DIST mate-themes-3.22.19.tar.xz 5567828 BLAKE2B
8eeead9b097e2a9e76aac849e6b6fe93382a6ff6dbdf4bd3b032167744fdf35ff047cdb85d1480474e1f0fc0f06ceda04e7d9e4a6ae573b04cd78c4e4ca858f7
SHA512
3e8a5a37bb6755c65da3307957569e84cce546c9786396f5eb8cb5f84ddf64e04260b87f67cb0b03c7c7dc13b4f75790fb9afe8b971101f3556ee6c015bb585d
DIST mate-themes-3.22.21.tar.xz 5377276 BLAKE2B
2efa2ab47440baa869da02fe8b65bc05a91ac79ab5d5794c182a05af736c4593b07c8c1ff9dde6b770462ad208d426565a7a07e359ee62ebc50ec7e737eaa7e5
SHA512
5f0e7e1f688e02a5c9581ec8f552da836a4c4355caa853650a19b670971acbecc3a4ac32aa7fb282879fd5a48e0a3e4aed5d182054fe2e9bb1270c74bfcef5bc
diff --git a/x11-themes/mate-themes/mate-themes-3.22.19.ebuild
b/x11-themes/mate-themes/mate-themes-3.22.19.ebuild
deleted file mode 100644
index 76ea9ce..000
--- a/x11-themes/mate-themes/mate-themes-3.22.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-MATE_GTK_V="$(ver_cut 1-2)"
-
-HOMEPAGE="https://mate-desktop.org;
-DESCRIPTION="A set of MATE themes, with sets for users with limited or low
vision"
-SRC_URI="https://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz;
-
-LICENSE="CC-BY-SA-3.0 GPL-3+ LGPL-2.1+ LGPL-3"
-SLOT="0/${MATE_GTK_V}"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
- >=x11-libs/gdk-pixbuf-2:2
- >=x11-libs/gtk+-2:2
- >=x11-themes/gtk-engines-2.15.3:2
- x11-themes/gtk-engines-murrine
-"
-
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35
- sys-devel/gettext
- >=sys-devel/autoconf-2.53
- >=x11-misc/icon-naming-utils-0.8.7:0
- virtual/pkgconfig
-"
-
-RESTRICT="binchecks strip"
-
-src_prepare() {
- default
- eautoreconf
-}
[gentoo-commits] proj/gentoo-mate:master commit in: dev-python/python-caja/
commit: 99637319a9e1ca6c1fbebfabc39f8103ddae4961
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:17:20 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:17:20 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=99637319
dev-python/python-caja: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
.../python-caja/python-caja-1.24.0-r1.ebuild | 57 --
1 file changed, 57 deletions(-)
diff --git a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
deleted file mode 100644
index 8984a57..000
--- a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.50:2
- $( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]'
)
- >=mate-base/caja-1.17.1[introspection]
- >=x11-libs/gtk+-3.22:3
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
- doc? ( app-text/docbook-xml-dtd:4.1.2 )
-"
-
-src_prepare() {
- MATE_FORCE_AUTORECONF="true"
-
- sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
- mate_src_prepare
-}
-
-src_install() {
- mate_src_install
-
- # Keep the directory for systemwide extensions.
- keepdir /usr/share/caja-python/extensions/
-
- # The HTML documentation generation is broken and commented out by
upstream.
- #
- #if use doc ; then
- # insinto /usr/share/gtk-doc/html/nautilus-python # for
dev-util/devhelp
- # doins -r docs/html/*
- #fi
-}
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-calc/
commit: d686d4233a20384da1bda409df700a1d958a45a4
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:23:19 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:23:19 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=d686d423
mate-extra/mate-calc: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-calc/Manifest| 1 -
mate-extra/mate-calc/mate-calc-1.24.0.ebuild | 33
2 files changed, 34 deletions(-)
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index 41cc423..0d6b318 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,2 +1 @@
-DIST mate-calc-1.24.0.tar.xz 939480 BLAKE2B
28a8184665096d477bdc80484fc9da3bf9835dd5d1c30d4de11722488d735f88336bcf990c50ef65dd0a5781fc083b5d011fd5085c2d1672e6599a28f4a01452
SHA512
ebb18f07ded5577bb0987b2027e7b73abc823a567bfa00f9cc9bfaf75de498f150b6b4c2e13486c530a3cbb078f1b798c415b33d668d952e8650799dd05c99eb
DIST mate-calc-1.24.1.tar.xz 952372 BLAKE2B
ae6c687d85f48f95fda89ba4fa2be44d1f2fc510708a25ac59fd8074d1f29bc6b440ec1c20b344566d4e8a2edc8ec0bdc0d565773f2c089d712c47db4e847805
SHA512
164fc57ed6bcc69b96afd75fff8dd6248ce682d6f806e83ddb73a21bddce99b89c7bb697d189b56d88d5c8d9a0b99f50f3fdd15c7d56f9121ee1d16689b16595
diff --git a/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
b/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
deleted file mode 100644
index 971bea1..000
--- a/mate-extra/mate-calc/mate-calc-1.24.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Calculator for MATE"
-LICENSE="CC-BY-SA-3.0 GPL-2+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.50:2
- dev-libs/libxml2:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/pango"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools
- dev-libs/libxml2
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*"
[gentoo-commits] proj/gentoo-mate:master commit in: app-editors/pluma/
commit: caddd2b81c550de65355b48f313a5b088ebaeab4
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:16:17 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:16:17 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=caddd2b8
app-editors/pluma: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
app-editors/pluma/Manifest| 1 -
app-editors/pluma/pluma-1.24.0.ebuild | 81 ---
2 files changed, 82 deletions(-)
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 181c887..106b02f 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,2 +1 @@
-DIST pluma-1.24.0.tar.xz 3717544 BLAKE2B
fd9375fd05566c11c24d5bdf55ab0d4619143127a5e48c4e91d18421f50340775d58c3e2264382aa3bbd8aad0569c559e87381a9ece07ce1592d1bc1a5315db1
SHA512
390bf2949549baa0e3dc706526217fbc1513e2f9778917710da806e58cdfb0b7a36e95ed2186442490996cf76783acd4e0f4b8f1fedacee9ba356c0d466510be
DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B
e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03
SHA512
0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3
diff --git a/app-editors/pluma/pluma-1.24.0.ebuild
b/app-editors/pluma/pluma-1.24.0.ebuild
deleted file mode 100644
index 66163bb..000
--- a/app-editors/pluma/pluma-1.24.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit mate python-single-r1 virtualx
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection spell test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=dev-libs/libpeas-1.2.0[gtk]
- >=dev-libs/libxml2-2.5:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3[introspection?]
- >=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE
- x11-libs/libX11
- >=x11-libs/libSM-1.0
- x11-libs/pango
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- spell? (
- >=app-text/enchant-1.6:=
- >=app-text/iso-codes-0.35
- )
- !!app-editors/mate-text-editor
-"
-
-RDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[introspection?]
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_configure() {
- mate_src_configure \
- $(use_enable introspection) \
- $(use_enable spell) \
- $(use_enable test tests)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-calc/
commit: 92e961f7aec38e1f0d76bc082e822e84a665afff
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:23:12 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:23:12 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=92e961f7
mate-extra/mate-calc: Stabilize 1.24.1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-calc/mate-calc-1.24.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
b/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
index 31d748f..ea4da84 100644
--- a/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Calculator for MATE"
[gentoo-commits] proj/gentoo-mate:master commit in: x11-themes/mate-themes/
commit: a6b0b6f783c319a8b2f97668cc8bb1beee0dd74a
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:19:50 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:19:50 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=a6b0b6f7
x11-themes/mate-themes: Stabilize 3.22.21 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
x11-themes/mate-themes/mate-themes-3.22.21.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-themes/mate-themes/mate-themes-3.22.21.ebuild
b/x11-themes/mate-themes/mate-themes-3.22.21.ebuild
index a32894e..0f0310a 100644
--- a/x11-themes/mate-themes/mate-themes-3.22.21.ebuild
+++ b/x11-themes/mate-themes/mate-themes-3.22.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@
SRC_URI="https://pub.mate-desktop.org/releases/themes/${MATE_GTK_V}/${P}.tar.xz;
LICENSE="CC-BY-SA-3.0 GPL-3+ LGPL-2.1+ LGPL-3"
SLOT="0/${MATE_GTK_V}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
RDEPEND="
>=x11-libs/gdk-pixbuf-2:2
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-utils/
commit: 30cd99c955facab17975ab262acb3d22771f183c
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:50:21 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:50:21 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=30cd99c9
mate-extra/mate-utils: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild | 73 --
mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild | 74 ---
2 files changed, 147 deletions(-)
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
deleted file mode 100644
index 28df90e..000
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test udisks"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=gnome-base/libgtop-2.12:2=
- >=media-libs/libcanberra-0.4[gtk3]
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/pango
- applet? ( >=mate-base/mate-panel-1.17.0 )
- udisks? ( >=sys-fs/udisks-1.90.0:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- dev-libs/libxml2
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-src_prepare() {
- # Make apps visible in all DEs.
- LC_ALL=C find . -iname '*.desktop.in*' -exec \
- sed -e '/OnlyShowIn/d' -i {} + || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-static \
- --enable-zlib \
- --enable-debug=$(usex debug yes minimum) \
- $(use_with X x) \
- $(use_enable applet gdict-applet) \
- $(use_enable ipv6) \
- $(use_enable udisks disk_image_mounter)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
b/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
deleted file mode 100644
index bb4e5c5..000
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test udisks"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=gnome-base/libgtop-2.12:2=
- >=media-libs/libcanberra-0.4[gtk3]
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/pango
- applet? ( >=mate-base/mate-panel-1.17.0 )
- udisks? ( >=sys-fs/udisks-1.90.0:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
- mate-base/mate-desktop
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- dev-libs/libxml2
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-
-src_prepare() {
- # Make apps visible in all DEs.
- LC_ALL=C find . -iname '*.desktop.in*' -exec \
- sed -e '/OnlyShowIn/d' -i {} + || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-static \
- --enable-zlib \
- --enable-debug=$(usex debug yes minimum) \
- $(use_with X x) \
- $(use_enable applet gdict-applet) \
- $(use_enable ipv6) \
- $(use_enable udisks disk_image_mounter)
-}
[gentoo-commits] proj/gentoo-mate:master commit in: x11-misc/mozo/
commit: 1da39ea6e0afad98207ee881a64a45644696660d
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:51:52 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:51:52 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=1da39ea6
x11-misc/mozo: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
x11-misc/mozo/mozo-1.24.0.ebuild | 69
1 file changed, 69 deletions(-)
diff --git a/x11-misc/mozo/mozo-1.24.0.ebuild b/x11-misc/mozo/mozo-1.24.0.ebuild
deleted file mode 100644
index a04c961..000
--- a/x11-misc/mozo/mozo-1.24.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
- >=mate-base/mate-menus-1.21.0[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.22:3[introspection]
- !!x11-misc/mate-menu-editor
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
-"
-
-src_prepare() {
- mate_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir mate_src_configure \
- --disable-icon-update
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
- installing() {
- mate_src_install
-
- # Massage shebang to make python_doscript happy
- sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
- -i mozo || die
-
- python_doscript mozo
- python_optimize
- }
-
- python_foreach_impl run_in_build_dir installing
-}
[gentoo-commits] proj/gentoo-mate:master commit in: x11-themes/mate-themes-meta/
commit: 8ca91d753b3f67510812ca896135601931e69605
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:22:35 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:22:35 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=8ca91d75
x11-themes/mate-themes-meta: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
.../mate-themes-meta/mate-themes-meta-3-r2.ebuild | 31 --
1 file changed, 31 deletions(-)
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild
b/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild
deleted file mode 100644
index 5089b27..000
--- a/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ]]; then
- MATE_THEMES_V="."
-else
- MATE_THEMES_V="*"
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Meta package to facilitate easy use of x11-themes/mate-themes"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage;
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="gtk2-only"
-
-DEPEND=""
-RDEPEND="|| (
- gtk2-only? (
- !!x11-libs/gtk+:3
- x11-themes/mate-themes:0
- )
- (
- =x11-libs/gtk+-3.22*:3
- =x11-themes/mate-themes-3.22${MATE_THEMES_V}:0/3.22
- )
- )"
[gentoo-commits] proj/gentoo-mate:master commit in: media-gfx/eom/
commit: 2a2d62184c4a313db5974ad923ad640989182104
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:25:16 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:45:44 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=2a2d6218
media-gfx/eom: Stabilize 1.24.1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
media-gfx/eom/eom-1.24.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/eom/eom-1.24.1.ebuild b/media-gfx/eom/eom-1.24.1.ebuild
index c7ad21a..2b39138 100644
--- a/media-gfx/eom/eom-1.24.1.ebuild
+++ b/media-gfx/eom/eom-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE image viewer"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-sensors-applet/
commit: 4a33b1ff8ebe70a4b10c4f4db7b1e7ec64c85202
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:47:37 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:47:37 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4a33b1ff
mate-extra/mate-sensors-applet: Stabilize 1.24.1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
index eea8796..429b41a 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="MATE panel applet to display readings from hardware sensors"
[gentoo-commits] proj/gentoo-mate:master commit in: media-gfx/eom/
commit: 4f4b52b3639109af19751460ddc32a8eb07e6ee5
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:25:24 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:45:44 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4f4b52b3
media-gfx/eom: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
media-gfx/eom/Manifest | 1 -
media-gfx/eom/eom-1.24.0-r2.ebuild | 74 --
2 files changed, 75 deletions(-)
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 556d685..4c916c8 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,2 +1 @@
-DIST eom-1.24.0.tar.xz 2433420 BLAKE2B
58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c
SHA512
17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
DIST eom-1.24.1.tar.xz 2408284 BLAKE2B
70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301
SHA512
70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0
diff --git a/media-gfx/eom/eom-1.24.0-r2.ebuild
b/media-gfx/eom/eom-1.24.0-r2.ebuild
deleted file mode 100644
index 0eaa262..000
--- a/media-gfx/eom/eom-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
-SLOT="0"
-
-IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.52:2
- >=dev-libs/libpeas-1.8.0[gtk]
- >=dev-libs/libxml2-2:2
- gnome-base/dconf
- >=mate-base/mate-desktop-1.17.0
- sys-libs/zlib
- x11-libs/cairo
- >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.22:3[introspection?]
- x11-libs/libX11
- >=x11-misc/shared-mime-info-0.20
- exif? (
- >=media-libs/libexif-0.6.14
- virtual/jpeg:0
- )
- imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
- !!media-gfx/mate-image-viewer
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools
- dev-util/glib-utils
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" )
-
-src_configure() {
- mate_src_configure \
- --enable-thumbnailer \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_with X x) \
- $(use_with exif libexif) \
- $(usex imagemagick \
- --without-gdk-pixbuf-thumbnailer \
- --with-gdk-pixbuf-thumbnailer \
- ) \
- $(use_with jpeg libjpeg) \
- $(use_with lcms cms) \
- $(use_with svg librsvg) \
- $(use_with xmp)
-}
[gentoo-commits] proj/gentoo-mate:master commit in: dev-python/python-caja/
commit: d59d472f2b4130284257dd251b9ab53c4d1bf480
Author: Adam Feldman gentoo org>
AuthorDate: Thu Jun 10 00:17:12 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Jun 10 00:17:12 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=d59d472f
dev-python/python-caja: Stabilize 1.24.0-r2 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
dev-python/python-caja/python-caja-1.24.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index f12f38b..c145f62 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{3_7,3_8} )
inherit mate python-single-r1
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="Python bindings for the Caja file manager"
[gentoo-commits] proj/gentoo-mate:master commit in: x11-terms/mate-terminal/
commit: 25bb25fc36ae5c35a08610882169b4e592af3e40
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:48:38 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:48:38 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=25bb25fc
x11-terms/mate-terminal: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
x11-terms/mate-terminal/Manifest | 1 -
.../mate-terminal/mate-terminal-1.24.0.ebuild | 43 --
2 files changed, 44 deletions(-)
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 59ab612..1b93277 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,2 +1 @@
-DIST mate-terminal-1.24.0.tar.xz 2084772 BLAKE2B
82909eb210bf5f0848e35b06b8569b22ba35ff515b2f90bc20e1766564997c7a44080597ac2efa825a8f9793f64c56136dd977b86e4d88e0886bb0e70c772e79
SHA512
2ad25411a8e720d3ef43964dc9f80732e215b1b5154e904069d25e73910c0c8f0e1b100d21f85b9a1eec06f6b17f891791445f7830bb52fc44b67fa3f8cebf76
DIST mate-terminal-1.24.1.tar.xz 2032824 BLAKE2B
d5c6e97fbb22550f8caf0042422ea9104b947f04e3dacb42bee4e6d1dcdbd59c8cb6765889ac86ea5850ac5ca293a9f796aa5c41d5e1707df2bb37670b3832f3
SHA512
83090667f823605ef0681efeff66c30729df83e7335c100171017ee5f2e819ec0bb219fdc71ed54a27c4a846fcc8db01c4462ef5b9c1e3f31d9c5838427566dc
diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.0.ebuild
b/x11-terms/mate-terminal/mate-terminal-1.24.0.ebuild
deleted file mode 100644
index 3a1096a..000
--- a/x11-terms/mate-terminal/mate-terminal-1.24.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="FDL-1.1+ GPL-3+ LGPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.50:2
- >=gnome-base/dconf-0.13.4
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/pango
- >=x11-libs/gtk+-3.22:3[X]
- >=x11-libs/vte-0.48:2.91
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.6
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig
-"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-user-share/
commit: 4186075e73490ee21e9abb31669b3ba3db609245
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:49:17 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:49:17 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4186075e
mate-extra/mate-user-share: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
.../mate-user-share/mate-user-share-1.24.0.ebuild | 52 --
1 file changed, 52 deletions(-)
diff --git a/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
b/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
deleted file mode 100644
index ec2217c..000
--- a/mate-extra/mate-user-share/mate-user-share-1.24.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="FDL-1.1+ GPL-2+"
-SLOT="0"
-
-IUSE="X"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70
- >=dev-libs/glib-2.50:2
- >=mate-base/caja-1.17.1
- media-libs/libcanberra[gtk3]
- >=sys-apps/dbus-1.1.1
- >=x11-libs/gdk-pixbuf-2:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/libX11
- x11-libs/pango
- >=x11-libs/libnotify-0.7
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=www-apache/mod_dnssd-0.6
-
>=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
-"
-
-src_configure() {
- mate_src_configure \
- --with-httpd=apache2 \
- --with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
- --disable-bluetooth \
- $(use_with X x)
-}
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-indicator-applet/
commit: 1ef9872c03c3a349d2bf89a464202d0574b464f6
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:28:46 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:45:44 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=1ef9872c
mate-extra/mate-indicator-applet: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
.../mate-indicator-applet-1.24.0.ebuild| 31 --
1 file changed, 31 deletions(-)
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
deleted file mode 100644
index da98ee5..000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate eapi7-ver
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-3 GPL-3+ LGPL-2+ LGPL-3+"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/libindicator-0.4:3
- >=mate-base/mate-panel-1.17.0
- >=x11-libs/gtk+-3.22:3
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig
-"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-netbook/
commit: adad619250a8074a7d5246e519cfd5e2c205c030
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:46:54 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:46:54 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=adad6192
mate-extra/mate-netbook: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild | 38 --
1 file changed, 38 deletions(-)
diff --git a/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
b/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
deleted file mode 100644
index baad717..000
--- a/mate-extra/mate-netbook/mate-netbook-1.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="LGPL-2+ GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.50:2
- >=mate-base/mate-panel-1.17.0
- >=x11-libs/gtk+-3.22:3
- x11-libs/libfakekey
- x11-libs/libwnck:3
- x11-libs/libXtst
- x11-libs/libX11
- x11-libs/cairo
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto
- >=dev-util/intltool-0.50.1
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
-"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-netbook/
commit: 69b249306ef694fb9915db66f2acd716670c939f
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:46:47 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:46:47 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=69b24930
mate-extra/mate-netbook: Stabilize 1.24.0-r1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
b/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
index fbc817f..17a460d 100644
--- a/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
+++ b/mate-extra/mate-netbook/mate-netbook-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="MATE utilities for netbooks"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-sensors-applet/
commit: 4f6c7095cd3c3d1f6c57b99b9909f362445e5384
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:47:43 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:47:43 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4f6c7095
mate-extra/mate-sensors-applet: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-sensors-applet/Manifest| 1 -
.../mate-sensors-applet-1.24.0.ebuild | 65 --
2 files changed, 66 deletions(-)
diff --git a/mate-extra/mate-sensors-applet/Manifest
b/mate-extra/mate-sensors-applet/Manifest
index 3c30bb2..ba5b4f7 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,2 +1 @@
-DIST mate-sensors-applet-1.24.0.tar.xz 580536 BLAKE2B
a72198917a3b87c1a9ed941aa272cab7439bcd07cb1bb2dbadb0fcd21bb5d6f1cc05986800de7d0f68c2c260cf9556f1e239a2ad2fd01bec8bdccad0180117b2
SHA512
039834b7cfe641e670e372e311da3d737254ab3cf13b27e71c6555888ac1165766fe2d940bcea44a5ceed5f0ddcd3390d01331d927121137c21a6647c68875c2
DIST mate-sensors-applet-1.24.1.tar.xz 578964 BLAKE2B
e9a7eacb032738014c3e91595ae1f2673973b20c09fd02bd186aa5468773a1322022fbb245b9ec6e9c987405014b91e0f7c12e072f9c3ba6cd9df32c1ee99703
SHA512
3bf21d501e067a2ce002c5149f42161cc6917609ceb2396b705e905987cb4d989725ca825c6de7bbe4e950f7a01e755c2cd5b45532d6f65aef690f394741489a
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
deleted file mode 100644
index 7f07d8d..000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.24.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="FDL-1.1+ GPL-2+"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.50:2
- >=mate-base/mate-panel-1.17.0
- >=x11-libs/cairo-1.0.4
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
- libnotify? ( >=x11-libs/libnotify-0.7 )
- lm-sensors? ( sys-apps/lm-sensors )
- video_cards_nvidia? ( || (
- >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
- ) )
-"
-
-RDEPEND="${COMMON_DEPEND}
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*
-"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
-
-src_configure() {
- local udisks
-
- if use hddtemp && use dbus; then
- udisks="--enable-udisks2"
- else
- udisks="--disable-udisks2"
- fi
-
- mate_src_configure \
- --disable-netbsd \
- --disable-static \
- --without-aticonfig \
- $(use_enable libnotify) \
- $(use_with lm-sensors libsensors) \
- $(use_with video_cards_nvidia nvidia) \
- ${udisks}
-}
[gentoo-commits] proj/gentoo-mate:master commit in: x11-terms/mate-terminal/
commit: be9a341564954088226bb1871f7e9e36b4878fa3
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:48:31 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:48:31 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=be9a3415
x11-terms/mate-terminal: Stabilize 1.24.1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
index 6582117..d93afe7 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE Terminal"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-utils/
commit: 4417bcbf8b67c366db271aec7b1dcc288bc1b478
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:50:13 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:50:13 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4417bcbf
mate-extra/mate-utils: Stabilize 1.24.0-r3 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
index 4ad6eec..c9c3477 100644
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Utilities for the MATE desktop"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/
commit: 06cbcabace23a21eb0cd1701bfa0da3a7fe60d1c
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:25:49 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:45:44 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=06cbcaba
mate-base/mate-applets: Stabilize 1.24.1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-base/mate-applets/mate-applets-1.24.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mate-base/mate-applets/mate-applets-1.24.1.ebuild
b/mate-base/mate-applets/mate-applets-1.24.1.ebuild
index 63d6ba9..f5bfe48 100644
--- a/mate-base/mate-applets/mate-applets-1.24.1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Applets for the MATE Desktop and Panel"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-base/mate-applets/
commit: 236d995860dc099e735ff0e7ce9c80c5fe83b1f2
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:25:57 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:45:44 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=236d9958
mate-base/mate-applets: Drop old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-base/mate-applets/Manifest | 1 -
mate-base/mate-applets/mate-applets-1.24.0.ebuild | 92 ---
2 files changed, 93 deletions(-)
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 146cf78..ee98eba 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,2 +1 @@
-DIST mate-applets-1.24.0.tar.xz 8142812 BLAKE2B
cbb76d6d64bb6e9b9f93197dbe79e2751877b0604c5a84ff4b6b00608f2930925bdbc2824dc96848c84496fa5f16ab38458775727b22cb07f4db9ca854f93c42
SHA512
345a80b123c705997d44ac5a4bea5249045d75181c3802cf49b2eb08decc14a12f75f2e06e6ebfae267b937ff10edf7638cd64332e2e2e731695e6260df5222e
DIST mate-applets-1.24.1.tar.xz 8222540 BLAKE2B
f018f131cedda486a28c3a125c07efaf5c3111f95c17b0c3fbdd0b1f084ddf851d46ea4ef511a1e57f6d9f7f29a28e48ab010abc4cc6d87c1315b79bfbf01849
SHA512
d29e39a140310fef84cb0fe631568e0177ca5faaf2bf566211a23b32613fd6aabf06dd8ecd81a16e09553c659a7feda9ba372bb62a70504a235be58e07726ed2
diff --git a/mate-base/mate-applets/mate-applets-1.24.0.ebuild
b/mate-base/mate-applets/mate-applets-1.24.0.ebuild
deleted file mode 100644
index eec4c6a..000
--- a/mate-base/mate-applets/mate-applets-1.24.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="CC-BY-SA-3.0 FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
-SLOT="0"
-
-IUSE="X +cpupower ipv6 policykit +upower"
-
-REQUIRED_USE="policykit? ( cpupower )"
-
-COMMON_DEPEND="dev-libs/atk
- >=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.50:2
- >=dev-libs/libmateweather-1.17.0
- >=dev-libs/libxml2-2.5:2
- >=gnome-base/libgtop-2.12.0:2=
- >=gnome-extra/gucharmap-3.0:2.90
- >=mate-base/mate-panel-1.17.0
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.10.0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7
- x11-libs/libX11
- >=x11-libs/libwnck-3.0:3
- x11-libs/pango
- cpupower? (
- sys-power/cpupower
- policykit? ( >=sys-auth/polkit-0.97:0 )
- )
- upower? ( >=sys-power/upower-0.9.23 )
- !!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-settings-daemon-1.6
- virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.8:*
- virtual/pkgconfig:*"
-
-src_configure() {
-
- # configure.ac logic is a little hinky
- # and ignores --enable flags for cpufreq
- use cpupower || myconf="--disable-cpufreq"
-
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- $(use_with X x) \
- $(use_with upower) \
- $(use_enable ipv6) \
- $(use_enable policykit polkit) \
- "${myconf[@]}"
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-src_install() {
- mate_src_install
-
- local APPLETS="accessx-status battstat charpick command cpufreq
drivemount
- geyes mateweather multiload netspeed stickynotes
- timerapplet trashapplet"
-
- for applet in ${APPLETS}; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-indicator-applet/
commit: 0bc7464be0b25f77fd1dda568f01a0d318fc
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:28:40 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:45:44 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=0bc74111
mate-extra/mate-indicator-applet: Stabilize 1.24.0-r1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
.../mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
index 670d2a4..5f1051f 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit mate eapi7-ver
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="MATE indicator applet"
[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/mate-user-share/
commit: 464968389dd2c60c1edc3f53af68c5ea5b742b58
Author: Adam Feldman gentoo org>
AuthorDate: Wed Jun 9 23:49:10 2021 +
Commit: Adam Feldman gentoo org>
CommitDate: Wed Jun 9 23:49:10 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=46496838
mate-extra/mate-user-share: Stabilize 1.24.0-r1 for amd64,x86
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman gentoo.org>
mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
index 5b09cfc..ad03ba3 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.24.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="Personal file sharing for the MATE desktop"
[gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/files/
commit: d94898411a2c2661bd3fffb5c84dd72e3546f97b Author: Sam James gentoo org> AuthorDate: Wed Jun 9 23:59:33 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jun 9 23:59:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9489841 net-dns/getdns: add link to upstream PR for docdir change URL: https://github.com/getdnsapi/getdns/pull/509 Signed-off-by: Sam James gentoo.org> net-dns/getdns/files/getdns-1.7.0-docdir.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch b/net-dns/getdns/files/getdns-1.7.0-docdir.patch index 1c955fdd4b3..e674a3b2b81 100644 --- a/net-dns/getdns/files/getdns-1.7.0-docdir.patch +++ b/net-dns/getdns/files/getdns-1.7.0-docdir.patch @@ -1,5 +1,4 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6928a02..e8a0cbb 100644 +https://github.com/getdnsapi/getdns/pull/509 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1101,9 +1101,8 @@ endif ()
[gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/
commit: f059f984ad2247c48ae6eefd897b825d36916d6b
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 22:52:34 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f059f984
dev-util/elfkickers: add 3.2
Signed-off-by: Sam James gentoo.org>
dev-util/elfkickers/Manifest | 1 +
dev-util/elfkickers/elfkickers-3.2.ebuild | 36 +++
2 files changed, 37 insertions(+)
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 9ec6982fc21..4a29c8469b0 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -1 +1,2 @@
DIST ELFkickers-3.1a.tar.gz 101709 BLAKE2B
f4e32be84bb05d0f5823fb09d60596086d70f726312285ce847b79ed7f08eed936cf72a9eff92123c4fecee9e4748a83363a05075a29d04490bd02701d53bc59
SHA512
a3ec3c1d5062c67e0108a04ea9a7e9d88d1e5090af887544be756f3269a28950d1211908b74da287d82975dada4a6ea30686b5a3cffa203b9ebf835a5c13d408
+DIST ELFkickers-3.2.tar.gz 108555 BLAKE2B
d9ed0c6a2a782e7178480436d526674661af1f625788a28c8e41b97cabb1412f083b492fd36778de17ded7d123003dde878a45af9a63cf7c1e7bff860dc3a0d1
SHA512
ea8b274030880579a44149a1c093e0dce2d9889729f5b4bf1a998d97a78f9bb3cf3fdec807eafda964060fd464a44d4992b35a397737724f7f95732186b8b3ea
diff --git a/dev-util/elfkickers/elfkickers-3.2.ebuild
b/dev-util/elfkickers/elfkickers-3.2.ebuild
new file mode 100644
index 000..eabb5ab6feb
--- /dev/null
+++ b/dev-util/elfkickers/elfkickers-3.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN=${PN/elf/ELF}-${PV}
+
+DESCRIPTION="Collection of programs to manipulate ELF files: sstrip, rebind,
elfls, elftoc"
+HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html;
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz;
+S="${WORKDIR}"/${MY_PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="app-misc/pax-utils"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1-respect-CFLAGS-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-3.1-create-destdir-path.patch
+ "${FILESDIR}"/add-freebsd-elf-defs.patch
+ "${FILESDIR}"/${PN}-3.1-AR.patch
+)
+
+src_prepare() {
+ default
+
+ tc-export AR CC
+
+ sed -i -e "s:^prefix = /usr/local:prefix = \${DESTDIR}/:" Makefile \
+ || die "sed failed"
+}
[gentoo-commits] repo/gentoo:master commit in: net-dns/getdns/, net-dns/getdns/files/
commit: 45217c6fa29dd8414c2561772df7d76b6abedca8
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 23:02:52 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45217c6f
net-dns/getdns: add 1.7.0
Signed-off-by: Sam James gentoo.org>
net-dns/getdns/Manifest| 1 +
net-dns/getdns/files/getdns-1.7.0-docdir.patch | 16 +
net-dns/getdns/files/stubby.initd-r1 | 0
net-dns/getdns/files/stubby.initd-r2 | 0
net-dns/getdns/getdns-1.7.0.ebuild | 94 ++
5 files changed, 111 insertions(+)
diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 144eeeba9b3..688c16cdad6 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,3 +1,4 @@
DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B
fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6
SHA512
4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B
c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4
SHA512
42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B
cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46
SHA512
b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
+DIST getdns-1.7.0.tar.gz 690885 BLAKE2B
25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072
SHA512
d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch
b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
new file mode 100644
index 000..1c955fdd4b3
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6928a02..e8a0cbb 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -1101,9 +1101,8 @@ endif ()
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION
${CMAKE_INSTALL_INCLUDEDIR})
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
+
+-set(docdir share/doc/getdns)
+-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION
${docdir})
+-install(FILES spec/index.html DESTINATION ${docdir}/spec)
++install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION
${CMAKE_INSTALL_DOCDIR})
++install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+
+ install(CODE "message(\"\
diff --git a/net-dns/getdns/files/stubby.initd-r1
b/net-dns/getdns/files/stubby.initd-r1
old mode 100755
new mode 100644
diff --git a/net-dns/getdns/files/stubby.initd-r2
b/net-dns/getdns/files/stubby.initd-r2
old mode 100755
new mode 100644
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild
b/net-dns/getdns/getdns-1.7.0.ebuild
new file mode 100644
index 000..39b9a79e186
--- /dev/null
+++ b/net-dns/getdns/getdns-1.7.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake fcaps systemd tmpfiles
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/;
+SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent
libuv static-libs stubby test +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+# (As of 1.7.0, seems to need network)
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-libs/libbsd
+ dev-libs/libyaml
+ dev-libs/openssl:=
+ idn? ( net-dns/libidn2:= )
+ gnutls? (
+ net-libs/gnutls:0=[dane,openssl]
+ dev-libs/nettle:0=
+ )
+ libev? ( dev-libs/libev:= )
+ libevent? ( dev-libs/libevent:= )
+ libuv? ( dev-libs/libuv:= )
+ test? ( dev-libs/check )
+ >=net-dns/unbound-1.5.9:=
+"
+RDEPEND="
+ ${DEPEND}
+ stubby? (
+ acct-group/stubby
+ acct-user/stubby
+ sys-libs/libcap
+ )
+"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-server/
commit: 2abf657e4b0c227462626768c991ac2a3f496692
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri May 14 16:50:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2abf657e
net-misc/gns3-server: remove old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Sam James gentoo.org>
net-misc/gns3-server/Manifest | 1 -
net-misc/gns3-server/gns3-server-2.2.17.ebuild | 64 --
2 files changed, 65 deletions(-)
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index b141be3bdd2..cafc795c858 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,3 +1,2 @@
-DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B
0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944
SHA512
233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57
DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B
213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e63493443c82b0d91b5afb61f
SHA512
f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B
da4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29
SHA512
adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
diff --git a/net-misc/gns3-server/gns3-server-2.2.17.ebuild
b/net-misc/gns3-server/gns3-server-2.2.17.ebuild
deleted file mode 100644
index 36b02014f94..000
--- a/net-misc/gns3-server/gns3-server-2.2.17.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd optfeature
-
-DESCRIPTION="GNS3 server to asynchronously manage emulators"
-HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server;
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=app-emulation/dynamips-0.2.18
- >=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
- >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
- >=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
- >=net-misc/ubridge-0.9.14
-"
-
-src_prepare() {
- default
-
- # newer python packages are fine
- sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements
failed"
-
- # Remove Pre-built busybox binary
- rm gns3server/compute/docker/resources/bin/busybox || die
-
- # Package installs 'tests' package which is forbidden
- rm -r tests || die
-}
-
-python_install() {
- distutils-r1_python_install
-
- systemd_dounit init/gns3.service.systemd
-
- mkdir -p
"${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
- ln -s /bin/busybox
"${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" ||
die
-}
-
-pkg_postinst() {
- optfeature "QEMU Support" "app-emulation/qemu"
- optfeature "Virtualbox Support" "app-emulation/virtualbox"
- optfeature "Docker Support" "app-emulation/docker"
- optfeature "Wireshark Support" "net-analyzer/wireshark"
- elog
- elog "The following packages are currently unsupported:"
- elog "iouyap and vpcs"
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-gui/
commit: c6dea6122004df73d40fd45acab5f5822067a571
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri May 14 16:51:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6dea612
net-misc/gns3-gui: remove old
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/20807
Signed-off-by: Sam James gentoo.org>
net-misc/gns3-gui/Manifest | 1 -
net-misc/gns3-gui/gns3-gui-2.2.17.ebuild | 42
2 files changed, 43 deletions(-)
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 7eb39dc47ba..f5cdf432284 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,2 @@
-DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B
16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8
SHA512
a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B
58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05
SHA512
a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
DIST gns3-gui-2.2.21.tar.gz 5162935 BLAKE2B
ebe60ecd2c2228a783ae8c0aa65213534a81495c7d0afbd5fee7023dcf87e2d25c6575f8b966299f2953e16749ef92d17b07a1cbcac211effb28baca6851aaa8
SHA512
64ec5b49e6dc2ae6af2618b5ad0f06d306c43989802db1f0e30e5fe1ca92bdbb53d011820ed622690f3d97987be94daf3bf9a9b6e6fd4fd04fa6e8bffa846423
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
b/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
deleted file mode 100644
index 222f29a2923..000
--- a/net-misc/gns3-gui/gns3-gui-2.2.17.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1 desktop xdg
-
-DESCRIPTION="Graphical Network Simulator"
-HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui;
-SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-#net-misc/gns3-server version should always match gns3-gui version
-RDEPEND="
- >=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
- >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
- ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
- dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
-"
-
-src_prepare() {
- default
-
- # newer python packages are fine
- sed -i -e 's/[<>=].*//' requirements.txt || die "fixing requirements
failed"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- doicon "resources/images/gns3.ico"
- make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
-}
[gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-server/
commit: 750537f3b0ee006350a998e730fc933db6f71064
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri May 14 16:47:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750537f3
net-misc/gns3-server: version bump (2.2.21)
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Sam James gentoo.org>
net-misc/gns3-server/Manifest | 1 +
net-misc/gns3-server/gns3-server-2.2.21.ebuild | 67 ++
2 files changed, 68 insertions(+)
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 93c1eeb7f7b..b141be3bdd2 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,2 +1,3 @@
DIST gns3-server-2.2.17.tar.gz 8980894 BLAKE2B
0f3698adeb7cf9daede05c0281a2c324bad0952a9e5774e11ebb9af342da020bac8b7acb05a938cd8df5a8934bed6bd2b56ee0187ea28b8356376e1f1396e944
SHA512
233db2e3bb3d6a071ce3ce24b8c86049f2707863f92ca67c4fdfb763bbdc98d3b78a1c2156d2d05548ee10f84394ab333f1c3404723091dc4e7edeb3df5a4a57
DIST gns3-server-2.2.19.tar.gz 9050750 BLAKE2B
213ab73e53ce1b87ae56739d4b1097c57f9d5b6b8c40aff8f95d4e32c21ef2f5a4689307920a9d2176adfa15c27e0e6cbb9e63493443c82b0d91b5afb61f
SHA512
f42ece97f9da398f3ab62fb80e2b13a5a1e51d1964a65014932b585673964265e361c5f5fdfbc453858fc868bae8cdbb897f93738abbd12c1f3b037595306039
+DIST gns3-server-2.2.21.tar.gz 9054117 BLAKE2B
da4dfe8d084184d38750c67152b99ee286dae88d92c15f153077396cdb008214da89d9161516daef0fbde8de3ba30f6628b9d138799d9ed8c1bc21c17f29
SHA512
adb7b08c88525f8b292688cd31973a00723b8d7989399d861e629bf754408901c2b00c67d425aacd7c234d9bab5d46542024196a4b44066eb1dbf39cf3d521bb
diff --git a/net-misc/gns3-server/gns3-server-2.2.21.ebuild
b/net-misc/gns3-server/gns3-server-2.2.21.ebuild
new file mode 100644
index 000..07b724ce647
--- /dev/null
+++ b/net-misc/gns3-server/gns3-server-2.2.21.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 systemd optfeature
+
+DESCRIPTION="GNS3 server to asynchronously manage emulators"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-server;
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=app-emulation/dynamips-0.2.18
+ >=dev-python/aiofiles-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-3.6.2[${PYTHON_USEDEP}]
+ >=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.11.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+ >=dev-python/py-cpuinfo-7.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+ >=net-misc/ubridge-0.9.14
+"
+
+src_prepare() {
+ default
+
+ # newer python packages are fine
+ sed -i -e 's/[<>=].*//' requirements.txt || die
+
+ # Remove Pre-built busybox binary
+ rm gns3server/compute/docker/resources/bin/busybox || die
+
+ # Package installs 'tests' package which is forbidden
+ rm -r tests || die
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ systemd_dounit init/gns3.service.systemd
+
+ mkdir -p
"${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+ ln -s /bin/busybox
"${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" ||
die
+}
+
+pkg_postinst() {
+ elog "net-misc/gns3-server has several optional packages that must be
merged manually for additional functionality."
+ elog ""
+ elog "The following is a list of packages that can be added:"
+ optfeature "QEMU Support" "app-emulation/qemu"
+ optfeature "Virtualbox Support" "app-emulation/virtualbox"
+ optfeature "Docker Support" "app-emulation/docker"
+ optfeature "Wireshark Support" "net-analyzer/wireshark"
+ elog ""
+ elog "The following packages are currently unsupported:"
+ elog "iouyap and vpcs"
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/gns3-gui/
commit: 007006068037e3384a9f8949b99d443c10b3bf01
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri May 14 16:50:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00700606
net-misc/gns3-gui: version bump (2.2.21)
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Sam James gentoo.org>
net-misc/gns3-gui/Manifest | 1 +
net-misc/gns3-gui/gns3-gui-2.2.21.ebuild | 42
2 files changed, 43 insertions(+)
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index e3132db992f..7eb39dc47ba 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,2 +1,3 @@
DIST gns3-gui-2.2.17.tar.gz 5161745 BLAKE2B
16501f3f2c9efa3f2bf0305f7af159f91d36000c4850fbcc8bf29afaf204de14d7f0531fc0c63d0e83b7c56a1a26961903852e06254057a4bcc8ff1c900613c8
SHA512
a3871a4d0470917b3bc7b0369ea30eb372cabc72bab1d036653ab94f09d75d5794cc58944905a2b72024c005c96172658a3f14ea081d2d81e7349df10c649045
DIST gns3-gui-2.2.19.tar.gz 5162823 BLAKE2B
58ed776ac542ff06e288c8af80af256e69d5c7bee637fd3ba539d0601035ea72f8673fb6fa31bef4671d1934d0e5bf06a28aa1281e2e6fb71408e8e09fcfdc05
SHA512
a1ca103f57edc639f60bb447f04b86f439e29500a8446c046cd2fbe5f9267e87394e1f2cd21e8f894c1e520ff0493f16235debba26d3855e1d1a423e2b7bb9af
+DIST gns3-gui-2.2.21.tar.gz 5162935 BLAKE2B
ebe60ecd2c2228a783ae8c0aa65213534a81495c7d0afbd5fee7023dcf87e2d25c6575f8b966299f2953e16749ef92d17b07a1cbcac211effb28baca6851aaa8
SHA512
64ec5b49e6dc2ae6af2618b5ad0f06d306c43989802db1f0e30e5fe1ca92bdbb53d011820ed622690f3d97987be94daf3bf9a9b6e6fd4fd04fa6e8bffa846423
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild
b/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild
new file mode 100644
index 000..f702b56de93
--- /dev/null
+++ b/net-misc/gns3-gui/gns3-gui-2.2.21.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9} )
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 desktop xdg
+
+DESCRIPTION="Graphical Network Simulator"
+HOMEPAGE="https://www.gns3.com/ https://github.com/GNS3/gns3-gui;
+SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+#net-misc/gns3-server version should always match gns3-gui version
+RDEPEND="
+ >=dev-python/distro-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
+ >=dev-python/sentry-sdk-0.14.4[${PYTHON_USEDEP}]
+ ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+ default
+
+ # newer python packages are fine
+ sed -i -e 's/[<>=].*//' requirements.txt || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ doicon "resources/images/gns3.ico"
+ make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
+}
[gentoo-commits] repo/gentoo:master commit in: sys-libs/fortify-headers/
commit: 12190cab26c6cf9e1f8d674aa9969c0dc04de2bb
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 22:49:22 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12190cab
sys-libs/fortify-headers: drop 0.6
Signed-off-by: Sam James gentoo.org>
sys-libs/fortify-headers/Manifest | 1 -
.../fortify-headers/fortify-headers-0.6.ebuild | 29 --
2 files changed, 30 deletions(-)
diff --git a/sys-libs/fortify-headers/Manifest
b/sys-libs/fortify-headers/Manifest
index 3884323f635..d28a37a0007 100644
--- a/sys-libs/fortify-headers/Manifest
+++ b/sys-libs/fortify-headers/Manifest
@@ -1,3 +1,2 @@
-DIST fortify-headers-0.6.tar.gz 5339 BLAKE2B
404a20de075551e11750f989e05d78f450b09fc879a7ff4b649773ebc012a93c42432cc7b60c70843a375d64f6aea3ec356cdfafc0133f8cc58dadfea9b982d3
SHA512
6106219332515e7c23354d916383cdac6efccba7eefa13b0c2c221d0fd03be7afb29b3a8622bd29b62ee0b602f9d1f273e1a08c07583bdcd12db9938ef4d7acc
DIST fortify-headers-0.7.tar.gz 5524 BLAKE2B
76ec4ee5b50bc77db05bf45a4a5550f3a369e5a49e333cd095613acbc04794d074103f3110c353a3283757f12cec866c45ed7d71ef4509667cae49926ee6953a
SHA512
9335d5042f973904cf131d4894c71d3d25c84e82427500064a4ed3f798abd8051c3b52375a17c807ca89227115fa5ba9922939f0e86059a9f04fee61f0b69e53
DIST fortify-headers-1.1.tar.gz 5510 BLAKE2B
d0454ad3ba432c051aeabfffad82799fae4ef37c07a8d2b8efcc26cd867dea8b31586f312d2947cb7e6ef7eedcacc3bb68591be4409376cc702ffbbafe144ea0
SHA512
a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0
diff --git a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
b/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
deleted file mode 100644
index e717acf59e4..000
--- a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == ** ]] ; then
- EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
- inherit git-r3
-else
-
#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz;
- SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz;
- KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="A standalone implementation of fortify source."
-HOMEPAGE="http://git.2f30.org/fortify-headers/;
-
-LICENSE="ISC"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile
- export DESTDIR="${D}"
- eapply_user
-}
[gentoo-commits] repo/gentoo:master commit in: dev-util/elfkickers/
commit: caa1695e4fe2021d6085746a74600684d2c3d8ce Author: Sam James gentoo org> AuthorDate: Wed Jun 9 22:50:58 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jun 9 23:55:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa1695e dev-util/elfkickers: add github remote-id Signed-off-by: Sam James gentoo.org> dev-util/elfkickers/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-util/elfkickers/metadata.xml b/dev-util/elfkickers/metadata.xml index 2305405b9c6..05b8ed4a979 100644 --- a/dev-util/elfkickers/metadata.xml +++ b/dev-util/elfkickers/metadata.xml @@ -10,4 +10,7 @@ Gentoo Hardened ELF kickers is a collection of programs that manipulate ELF files. The main purpose of these programs is to be illustrative and educational -- to help fellow programmers understand the ELF file format and something of how it works under the Linux platform. + + BR903/ELFkickers +
[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/
commit: 048d48204a1eb5b0c830ceefb57e505f1d3c0fe2 Author: Sam James gentoo org> AuthorDate: Wed Jun 9 22:43:29 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jun 9 23:55:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048d4820 net-misc/stunnel: add changelog Signed-off-by: Sam James gentoo.org> net-misc/stunnel/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml index 7b9debfb547..4f231a81f72 100644 --- a/net-misc/stunnel/metadata.xml +++ b/net-misc/stunnel/metadata.xml @@ -15,4 +15,7 @@ protocols (like POP, IMAP, LDAP, etc) by having Stunnel provide the encryption, requiring no changes to the daemon's code. + + https://www.stunnel.org/NEWS.html +
[gentoo-commits] repo/gentoo:master commit in: sys-libs/fortify-headers/
commit: c8d5590a411496c9ab1acb2a1f1b8e0456a9d548
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 23:53:46 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d5590a
sys-libs/fortify-headers: update EAPI 6 -> 7, backport ${ED} fix
Signed-off-by: Sam James gentoo.org>
sys-libs/fortify-headers/fortify-headers-0.7.ebuild | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
index e717acf59e4..12b1d42a974 100644
--- a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
@@ -17,13 +17,13 @@ HOMEPAGE="http://git.2f30.org/fortify-headers/;
LICENSE="ISC"
SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
src_prepare() {
- sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile
- export DESTDIR="${D}"
- eapply_user
+ sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile || die
+ default
+}
+
+src_install() {
+ export DESTDIR="${ED}"
+ default
}
[gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/
commit: ed55662e3fb22e0221e19b692e31c921318e0f18
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 22:42:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed55662e
net-misc/stunnel: add 5.59
Signed-off-by: Sam James gentoo.org>
net-misc/stunnel/Manifest| 1 +
net-misc/stunnel/stunnel-5.59.ebuild | 101 +++
2 files changed, 102 insertions(+)
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index e879a2e6aed..2b47fe53b95 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1 +1,2 @@
DIST stunnel-5.58.tar.gz 988551 BLAKE2B
45ce3d43ff683fa1146ced00c6a2ef7c09a935da3dcd1a6529fa024e064c251798d96a1e45d4abf13195ca50fb7f1cf3ddc25c9e954a1cad8bb4745c4e35701d
SHA512
6f62bf13bf53f174b2810ad6708a9dfdb70e9b4e2f60c0c9cf4df691169a63014901402ccbe2862010f4cee240c1a8eec34b70a7a3fcef36e7a2ca14a7f70ece
+DIST stunnel-5.59.tar.gz 995508 BLAKE2B
12dc07e5ef04dcc505d97cefeaee98284a1c85ca886f731bfe7af3a1ad5448e47ea1fc08ab3b6f79b71c8d91ec4f09c355397e6e1052384f77cbd1cf2a17
SHA512
c9f93ff6a09baef6d85e883cb469de495f5c006b9f0d3e018ade7a21bb3521e3db7982701c752d6b117ff2ad03a7f7299afd399c8956006af2eade52358ac1c7
diff --git a/net-misc/stunnel/stunnel-5.59.ebuild
b/net-misc/stunnel/stunnel-5.59.ebuild
new file mode 100644
index 000..40631323d41
--- /dev/null
+++ b/net-misc/stunnel/stunnel-5.59.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit ssl-cert systemd tmpfiles
+
+DESCRIPTION="TLS/SSL - Port Wrapper"
+HOMEPAGE="https://www.stunnel.org/index.html;
+SRC_URI="
+ https://www.stunnel.org/downloads/${P}.tar.gz
+ ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+
http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz
+ http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+ ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 selinux stunnel3 tcpd"
+
+DEPEND="
+ dev-libs/openssl:0=
+ tcpd? ( sys-apps/tcp-wrappers )
+"
+
+RDEPEND="
+ acct-user/stunnel
+ acct-group/stunnel
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-stunnel )
+ stunnel3? ( dev-lang/perl )
+"
+
+RESTRICT="test"
+
+src_prepare() {
+ # Hack away generation of certificate
+ sed -i -e "s/^install-data-local:/do-not-run-this:/" \
+ tools/Makefile.in || die "sed failed"
+
+ echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel
+
+ eapply_user
+}
+
+src_configure() {
+ local myeconfargs=(
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ $(use_enable ipv6)
+ $(use_enable tcpd libwrap)
+ --with-ssl="${EPREFIX}"/usr
+ --disable-fips
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ rm -rf "${ED}"/usr/share/doc/${PN}
+ rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
+ "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+ use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
+
+ # The binary was moved to /usr/bin with 4.21,
+ # symlink for backwards compatibility
+ dosym ../bin/stunnel /usr/sbin/stunnel
+
+ dodoc AUTHORS.md BUGS.md CREDITS.md PORTS.md README.md TODO.md
+ docinto html
+ dodoc doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \
+ tools/importCA.html
+
+ insinto /etc/stunnel
+ doins "${FILESDIR}"/stunnel.conf
+ newinitd "${FILESDIR}"/stunnel-r2 stunnel
+
+ doenvd "${T}"/20stunnel
+
+ systemd_dounit "${S}/tools/stunnel.service"
+ newtmpfiles "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf
+}
+
+pkg_postinst() {
+ if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then
+ install_cert /etc/stunnel/stunnel
+ chown stunnel:stunnel
"${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem}
+ fi
+
+ einfo "If you want to run multiple instances of stunnel, create a new
config"
+ einfo "file ending with .conf in /etc/stunnel/. **Make sure** you
change "
+ einfo "\'pid= \' with a unique filename. For openrc make a symlink
from the"
+ einfo "stunnel init script to \'stunnel.name\' and use that to
start|stop"
+
[gentoo-commits] repo/gentoo:master commit in: sys-libs/fortify-headers/
commit: 7589439e29ef225b4fd936af8203f8ae8969021b
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 22:48:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7589439e
sys-libs/fortify-headers: add 1.1
Closes: https://bugs.gentoo.org/716234
Signed-off-by: Sam James gentoo.org>
sys-libs/fortify-headers/Manifest | 1 +
.../fortify-headers/fortify-headers-0.6.ebuild | 5 +--
.../fortify-headers/fortify-headers-0.7.ebuild | 5 +--
.../fortify-headers/fortify-headers-1.1.ebuild | 36 ++
.../fortify-headers/fortify-headers-.ebuild| 30 +++---
5 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/sys-libs/fortify-headers/Manifest
b/sys-libs/fortify-headers/Manifest
index f31dc4adc86..3884323f635 100644
--- a/sys-libs/fortify-headers/Manifest
+++ b/sys-libs/fortify-headers/Manifest
@@ -1,2 +1,3 @@
DIST fortify-headers-0.6.tar.gz 5339 BLAKE2B
404a20de075551e11750f989e05d78f450b09fc879a7ff4b649773ebc012a93c42432cc7b60c70843a375d64f6aea3ec356cdfafc0133f8cc58dadfea9b982d3
SHA512
6106219332515e7c23354d916383cdac6efccba7eefa13b0c2c221d0fd03be7afb29b3a8622bd29b62ee0b602f9d1f273e1a08c07583bdcd12db9938ef4d7acc
DIST fortify-headers-0.7.tar.gz 5524 BLAKE2B
76ec4ee5b50bc77db05bf45a4a5550f3a369e5a49e333cd095613acbc04794d074103f3110c353a3283757f12cec866c45ed7d71ef4509667cae49926ee6953a
SHA512
9335d5042f973904cf131d4894c71d3d25c84e82427500064a4ed3f798abd8051c3b52375a17c807ca89227115fa5ba9922939f0e86059a9f04fee61f0b69e53
+DIST fortify-headers-1.1.tar.gz 5510 BLAKE2B
d0454ad3ba432c051aeabfffad82799fae4ef37c07a8d2b8efcc26cd867dea8b31586f312d2947cb7e6ef7eedcacc3bb68591be4409376cc702ffbbafe144ea0
SHA512
a39d6e7c002bf91085f712aa46bc3f53ff934cc963694a229fa82d84ff4a7556105212a84a231ab5367c01c6a1e385172173f1f4a34d5eb4d2d9c58472c23dd0
diff --git a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
b/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
index 9f9374176ea..e717acf59e4 100644
--- a/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,8 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
inherit git-r3
else
-
SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz;
+
#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz;
+ SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz;
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
fi
diff --git a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
index 9f9374176ea..e717acf59e4 100644
--- a/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
+++ b/sys-libs/fortify-headers/fortify-headers-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,8 @@ if [[ ${PV} == ** ]] ; then
EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
inherit git-r3
else
-
SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz;
+
#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz;
+ SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz;
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
fi
diff --git a/sys-libs/fortify-headers/fortify-headers-1.1.ebuild
b/sys-libs/fortify-headers/fortify-headers-1.1.ebuild
new file mode 100644
index 000..5347e1e5768
--- /dev/null
+++ b/sys-libs/fortify-headers/fortify-headers-1.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == ** ]] ; then
+ EGIT_REPO_URI="git://git.2f30.org/fortify-headers"
+ inherit git-r3
+else
+
#SRC_URI="http://git.2f30.org/fortify-headers/snapshot/fortify-headers-${PV}.tar.gz;
+ SRC_URI="https://dl.2f30.org/releases/${P}.tar.gz;
+ KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+DESCRIPTION="A standalone implementation of fortify source"
+HOMEPAGE="http://git.2f30.org/fortify-headers/;
+
+LICENSE="ISC"
+SLOT="0"
+
+src_prepare() {
+ sed -i -e 's|^PREFIX = /usr/local|PREFIX = /usr|g' Makefile || die
+ default
+}
+
+src_compile() {
+ # Nothing to do here but defining a dummy phase allows us to not trigger
+ # the catch-all rule and try to install here where we don't have access
+ # to ${ED}
+ :;
+}
+
+src_install() {
+ export DESTDIR="${ED}"
+ default
+}
diff --git
[gentoo-commits] repo/gentoo:master commit in: net-misc/nyx/
commit: 9d017ba828cdc38fe5d247cade10d42957c9ec7c
Author: Jeffrey Lin icurse nl>
AuthorDate: Tue Aug 11 22:09:57 2020 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 23:55:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d017ba8
net-misc/nyx: require python[ncurses]
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jeffrey Lin icurse.nl>
Closes: https://github.com/gentoo/gentoo/pull/17093
Signed-off-by: Sam James gentoo.org>
net-misc/nyx/{nyx-2.1.0-r1.ebuild => nyx-2.1.0-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-misc/nyx/nyx-2.1.0-r1.ebuild b/net-misc/nyx/nyx-2.1.0-r2.ebuild
similarity index 94%
rename from net-misc/nyx/nyx-2.1.0-r1.ebuild
rename to net-misc/nyx/nyx-2.1.0-r2.ebuild
index cfc8c7e5f17..bdfe4377ba8 100644
--- a/net-misc/nyx/nyx-2.1.0-r1.ebuild
+++ b/net-misc/nyx/nyx-2.1.0-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=(python3_{7,8} pypy3)
-PYTHON_REQ_USE='sqlite(-)'
+PYTHON_REQ_USE='ncurses,sqlite(-)'
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
[gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/
commit: fc2146b7e4ab0d49db91ee363112c2f5d20248b1
Author: Matthias Maier gentoo org>
AuthorDate: Wed Jun 9 23:39:06 2021 +
Commit: Matthias Maier gentoo org>
CommitDate: Wed Jun 9 23:45:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc2146b7
app-emulation/libvirt: fix compilation
Closes: https://bugs.gentoo.org/795144
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Matthias Maier gentoo.org>
app-emulation/libvirt/libvirt-7.4.0.ebuild | 2 +-
app-emulation/libvirt/libvirt-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-emulation/libvirt/libvirt-7.4.0.ebuild
b/app-emulation/libvirt/libvirt-7.4.0.ebuild
index ccc4f6f1ce7..d41bb6fce53 100644
--- a/app-emulation/libvirt/libvirt-7.4.0.ebuild
+++ b/app-emulation/libvirt/libvirt-7.4.0.ebuild
@@ -226,7 +226,7 @@ src_prepare() {
src_configure() {
local emesonargs=(
$(meson_feature apparmor)
- $(meson_feature apparmor apparmor_profiles)
+ $(meson_use apparmor apparmor_profiles)
$(meson_feature audit)
$(meson_feature caps capng)
$(meson_feature dtrace)
diff --git a/app-emulation/libvirt/libvirt-.ebuild
b/app-emulation/libvirt/libvirt-.ebuild
index ccc4f6f1ce7..d41bb6fce53 100644
--- a/app-emulation/libvirt/libvirt-.ebuild
+++ b/app-emulation/libvirt/libvirt-.ebuild
@@ -226,7 +226,7 @@ src_prepare() {
src_configure() {
local emesonargs=(
$(meson_feature apparmor)
- $(meson_feature apparmor apparmor_profiles)
+ $(meson_use apparmor apparmor_profiles)
$(meson_feature audit)
$(meson_feature caps capng)
$(meson_feature dtrace)
[gentoo-commits] repo/gentoo:master commit in: media-sound/gnome-music/
commit: 78de16124a8079ca35362f9428bb8f86997b6848
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 22:39:27 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Jun 9 22:44:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78de1612
media-sound/gnome-music: Version bump to 40.1.1
Signed-off-by: Matt Turner gentoo.org>
media-sound/gnome-music/Manifest | 1 +
media-sound/gnome-music/gnome-music-40.1.1.ebuild | 79 +++
2 files changed, 80 insertions(+)
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index cdb63278bc3..1e13ebf460f 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1 +1,2 @@
DIST gnome-music-40.0.tar.xz 977412 BLAKE2B
acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7
SHA512
7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
+DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B
cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083
SHA512
3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
diff --git a/media-sound/gnome-music/gnome-music-40.1.1.ebuild
b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
new file mode 100644
index 000..e4f1fbfad03
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-40.1.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music;
+
+LICENSE="GPL-2+"
+SLOT="0"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.50:2
+ >=net-libs/gnome-online-accounts-3.35.90[introspection]
+ >=dev-libs/gobject-introspection-1.54:=
+ >=x11-libs/gtk+-3.24.7:3[introspection]
+ >=dev-libs/libdazzle-3.28.0[introspection]
+ >=media-libs/libmediaart-1.9.1:2.0[introspection]
+ net-libs/libsoup:2.4[introspection]
+ app-misc/tracker:3=[introspection(+)]
+ >=x11-libs/pango-1.44:=
+ $(python_gen_cond_dep '
+ >=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_MULTI_USEDEP}]
+ >=dev-python/pycairo-1.14.0[${PYTHON_MULTI_USEDEP}]
+ ')
+ >=media-libs/grilo-0.3.13:0.3[introspection]
+ >=media-plugins/grilo-plugins-0.3.13:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${DEPEND}
+ || (
+ app-misc/tracker-miners:3[gstreamer]
+ app-misc/tracker-miners:3[ffmpeg]
+ )
+ x11-libs/libnotify[introspection]
+ media-libs/gstreamer:1.0[introspection]
+ media-libs/gst-plugins-base:1.0[introspection]
+ media-plugins/gst-plugins-meta:1.0
+ media-plugins/grilo-plugins:0.3[tracker]
+ x11-misc/xdg-user-dirs
+"
+BDEPEND="
+ dev-libs/libxml2:2
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python
fixup sed failed"
+ xdg_src_prepare
+}
+
+src_install() {
+ meson_src_install
+ python_fix_shebang "${D}"/usr/bin/gnome-music
+ python_optimize
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_schemas_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_schemas_update
+}
[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-desktop/
commit: bbdbbebfa74f13880d773e2091c834ffb5380f83
Author: Matt Turner gentoo org>
AuthorDate: Wed Jun 9 22:34:13 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Jun 9 22:44:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdbbebf
gnome-base/gnome-desktop: Version bump to 40.2
Signed-off-by: Matt Turner gentoo.org>
gnome-base/gnome-desktop/Manifest | 1 +
gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild | 72 ++
2 files changed, 73 insertions(+)
diff --git a/gnome-base/gnome-desktop/Manifest
b/gnome-base/gnome-desktop/Manifest
index d63b6df7d17..2a0f45ca462 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -1 +1,2 @@
DIST gnome-desktop-40.1.tar.xz 721416 BLAKE2B
de1432a9ee61fa0545ce09c1228a133555d732ea58b9550a1f218726342d4c4e1c9d30f402b62a6a370cd281302c47f820f8bccbd69f8b8651f77e4b0e8d4f66
SHA512
ff9da5d0c805a7d42339a9174b907dd0cc4845c8eeb5a004a13f001dbe449f28a6360ed9dc1951376be4a48271908990052ca0e8d6e4339214cafcb80d204b57
+DIST gnome-desktop-40.2.tar.xz 721852 BLAKE2B
a7258d0465b17c5c9c78a066acd72571c002054f196d847e07b10055b1d72900d6efc80ac623f118ff11a87a4d5042ac9902f7f3f9d5a181ad3d80429cf9f904
SHA512
2fd3ba5eb0263aecc43978d84070619c16af4de998b344bc2aaac16aa0e734d93235aa218c2684ad993b471136434b97dffae52f183798daaa4ec47574cc51b3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild
b/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild
new file mode 100644
index 000..b42b6b81c1b
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-40.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Library with common API for various GNOME modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/;
+
+LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
+SLOT="3/19" # subslot = libgnome-desktop-3 soname version
+IUSE="debug gtk-doc +introspection seccomp systemd udev"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux ~x86-solaris"
+
+COMMON_DEPEND="
+ >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
+ >=x11-libs/gtk+-3.3.6:3[X,introspection?]
+ >=dev-libs/glib-2.53.0:2
+ >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?]
+ x11-misc/xkeyboard-config
+ x11-libs/libxkbcommon
+ app-text/iso-codes
+ systemd? ( sys-apps/systemd:= )
+ udev? (
+ sys-apps/hwids
+ virtual/libudev:= )
+ seccomp? ( sys-libs/libseccomp )
+
+ x11-libs/cairo:=
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${COMMON_DEPEND}
+ media-libs/fontconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ seccomp? ( sys-apps/bubblewrap )
+"
+BDEPEND="
+ app-text/docbook-xml-dtd:4.1.2
+ dev-util/gdbus-codegen
+ gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.8
+ x11-base/xorg-proto
+ virtual/pkgconfig
+"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from
xorg-proto
+
+PATCHES=(
+ "${FILESDIR}"/3.32.2-optional-introspection.patch # add introspection
meson option
+)
+
+src_prepare() {
+ # Don't build manual test programs that will never get run
+ sed -i -e "/'test-.*'/d" libgnome-desktop/meson.build || die
+ xdg_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dgnome_distributor=Gentoo
+ -Ddate_in_gnome_version=true
+ -Ddesktop_docs=true
+ $(meson_use debug debug_tools)
+ $(meson_use introspection)
+ $(meson_feature udev)
+ $(meson_feature systemd)
+ $(meson_use gtk-doc gtk_doc)
+ -Dinstalled_tests=false
+ )
+ meson_src_configure
+}
[gentoo-commits] proj/releng:master commit in: releases/specs/ppc/ppc64/, releases/specs/ppc/ppc64le/
commit: 4d8b4d68504beb838ce2d2823e6489796e629842 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jun 9 22:33:48 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 9 22:34:37 2021 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=4d8b4d68 releases/specs/ppc: musl stages -> stages-musl portagedir Issue: https://github.com/gentoo/musl/issues/351 Signed-off-by: Georgy Yakovlev sysdump.net> releases/specs/ppc/ppc64/musl-hardened-stage1.spec | 2 +- releases/specs/ppc/ppc64/musl-hardened-stage3.spec | 2 +- releases/specs/ppc/ppc64le/musl-hardened-stage1.spec | 2 +- releases/specs/ppc/ppc64le/musl-hardened-stage3.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/releases/specs/ppc/ppc64/musl-hardened-stage1.spec b/releases/specs/ppc/ppc64/musl-hardened-stage1.spec index ca213ebb..f632f32e 100644 --- a/releases/specs/ppc/ppc64/musl-hardened-stage1.spec +++ b/releases/specs/ppc/ppc64/musl-hardened-stage1.spec @@ -9,6 +9,6 @@ chost: powerpc64-gentoo-linux-musl compression_mode: pixz_x update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5 -portage_confdir: @REPO_DIR@/releases/portage/stages +portage_confdir: @REPO_DIR@/releases/portage/stages-musl portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64/musl-hardened-stage3.spec b/releases/specs/ppc/ppc64/musl-hardened-stage3.spec index 8e90a0b4..1a9a8d45 100644 --- a/releases/specs/ppc/ppc64/musl-hardened-stage3.spec +++ b/releases/specs/ppc/ppc64/musl-hardened-stage3.spec @@ -6,6 +6,6 @@ profile: default/linux/ppc64/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-ppc64-musl-hardened-@TIMESTAMP@ compression_mode: pixz_x -portage_confdir: @REPO_DIR@/releases/portage/stages +portage_confdir: @REPO_DIR@/releases/portage/stages-musl portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec b/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec index fea71ba7..9d65a83c 100644 --- a/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec +++ b/releases/specs/ppc/ppc64le/musl-hardened-stage1.spec @@ -9,6 +9,6 @@ chost: powerpc64le-gentoo-linux-musl compression_mode: pixz_x update_seed: yes update_seed_command: --update --deep --newuse @world --jobs 5 --load-average 5 -portage_confdir: @REPO_DIR@/releases/portage/stages +portage_confdir: @REPO_DIR@/releases/portage/stages-musl portage_prefix: releng repos: /var/db/repos/musl diff --git a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec b/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec index da721a6c..588fe8c3 100644 --- a/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec +++ b/releases/specs/ppc/ppc64le/musl-hardened-stage3.spec @@ -6,6 +6,6 @@ profile: default/linux/ppc64le/17.0/musl/hardened snapshot: @TIMESTAMP@ source_subpath: musl-hardened/stage1-ppc64le-musl-hardened-@TIMESTAMP@ compression_mode: pixz_x -portage_confdir: @REPO_DIR@/releases/portage/stages +portage_confdir: @REPO_DIR@/releases/portage/stages-musl portage_prefix: releng repos: /var/db/repos/musl
[gentoo-commits] proj/releng:master commit in: releases/portage/stages-musl/package.use/releng/, ...
commit: f3bdefec6fd731e128157d428185e50c0b0ed691 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jun 9 22:28:12 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Jun 9 22:29:43 2021 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=f3bdefec releases/portage/stages-musl: add musl portage config copy of regular one + gcc::gentoo mask Issue: https://github.com/gentoo/musl/issues/351 Signed-off-by: Georgy Yakovlev sysdump.net> releases/portage/stages-musl/package.mask/releng/gcc-musl-repo | 3 +++ releases/portage/stages-musl/package.use/releng/libpcre| 5 + releases/portage/stages-musl/package.use/releng/no-filecaps| 7 +++ 3 files changed, 15 insertions(+) diff --git a/releases/portage/stages-musl/package.mask/releng/gcc-musl-repo b/releases/portage/stages-musl/package.mask/releng/gcc-musl-repo new file mode 100644 index ..3a1a423d --- /dev/null +++ b/releases/portage/stages-musl/package.mask/releng/gcc-musl-repo @@ -0,0 +1,3 @@ +# we need gcc from musl repo that contains pure64 patches +# https://github.com/gentoo/musl/issues/351 +sys-devel/gcc::gentoo diff --git a/releases/portage/stages-musl/package.use/releng/libpcre b/releases/portage/stages-musl/package.use/releng/libpcre new file mode 100644 index ..84d84b54 --- /dev/null +++ b/releases/portage/stages-musl/package.use/releng/libpcre @@ -0,0 +1,5 @@ +# required by sys-libs/libselinux-2.7 +dev-libs/libpcre static-libs + +# required by dev-vcs/git +dev-libs/libpcre2 jit diff --git a/releases/portage/stages-musl/package.use/releng/no-filecaps b/releases/portage/stages-musl/package.use/releng/no-filecaps new file mode 100644 index ..901e5c36 --- /dev/null +++ b/releases/portage/stages-musl/package.use/releng/no-filecaps @@ -0,0 +1,7 @@ +# For stage building, we cannot be sure the final unpack destination will have +# xattr/fcaps support. To be safe, we build stages without filecaps, but allow +# filecaps to be turned back on @ next full world upgrade. The ebuilds using +# fcaps eclass will have more logic to safely fall back in case of missing +# support. + +*/* -filecaps
[gentoo-commits] repo/gentoo:master commit in: app-admin/salt/, app-admin/salt/files/
commit: a5da849d9276e29315f17f643ddc573df9fd43e4
Author: Patrick McLean sony com>
AuthorDate: Wed Jun 9 22:26:46 2021 +
Commit: Patrick McLean gentoo org>
CommitDate: Wed Jun 9 22:27:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5da849d
app-admin/salt-3000.9: Version bump
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Patrick McLean gentoo.org>
app-admin/salt/Manifest | 1 +
app-admin/salt/files/salt-3000.9-tests.patch | 12 ++
app-admin/salt/salt-3000.9.ebuild| 203 +++
3 files changed, 216 insertions(+)
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index f47131ca6e5..cc3b4f7d734 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -1,5 +1,6 @@
DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B
68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec
SHA512
6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
DIST salt-3000.8.tar.gz 15249139 BLAKE2B
df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4
SHA512
a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800
+DIST salt-3000.9.tar.gz 15250432 BLAKE2B
b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f
SHA512
94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092
DIST salt-3001.6.tar.gz 15736056 BLAKE2B
00e7674452e9d61c3cd487d27a3a1f3435c6b12dcc89008aa63c96814957b6ce8654f4d4d51dbce7b14027f0cee66fd2ea9602f6be18bf2f4beac11ae164f89f
SHA512
e45c9cfddb64ab1c9d66b6b6b3e5ff8d9010c01307161e5013140b4362ee630cf912ab153d1afa72f56d18fc5353293b2f4b449caf8ee384d1e93204d490bf4c
DIST salt-3002.5.tar.gz 15784880 BLAKE2B
baa90bb0caea572dfbe12d92fb488ee0c4adef9a07221f394009cd43a62ffef18c57f2e7cdcfcd923807c7a3d02ce6833480f74d70250c29d311420f30514300
SHA512
dda2caa338f646ec51d2de6b0df10fbb27eceddbe8c797ae192b9ef1312d566ae71a243a3a95918fa375b125089aa29a73b1b908c5cc1b0451dccb582a4978a1
DIST salt-3003.tar.gz 15830910 BLAKE2B
ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f
SHA512
7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
diff --git a/app-admin/salt/files/salt-3000.9-tests.patch
b/app-admin/salt/files/salt-3000.9-tests.patch
new file mode 100644
index 000..9b7a1786e72
--- /dev/null
+++ b/app-admin/salt/files/salt-3000.9-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/unit/modules/test_cmdmod.py
b/tests/unit/modules/test_cmdmod.py
+index 2d88706b49..ec8b623f5b 100644
+--- a/tests/unit/modules/test_cmdmod.py
b/tests/unit/modules/test_cmdmod.py
+@@ -509,6 +509,7 @@ class CMDMODTestCase(TestCase, LoaderModuleMockMixin):
+ self.assertEqual(ret['stdout'],
+ salt.utils.stringutils.to_unicode(stdout))
+
++@skipIf(True, "Not happy in sandbox")
+ def test_run_all_output_loglevel_debug(self):
+ '''
+ Test that specifying debug for loglevel
diff --git a/app-admin/salt/salt-3000.9.ebuild
b/app-admin/salt/salt-3000.9.ebuild
new file mode 100644
index 000..9818e6b40a9
--- /dev/null
+++ b/app-admin/salt/salt-3000.9.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://www.saltstack.com/resources/community/
+ https://github.com/saltstack;
+
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+
https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz;
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
+ mongodb neutron nova openssl portage profile redis selinux test raet
+ +zeromq vim-syntax"
+
+RDEPEND="
+ sys-apps/pciutils
+ dev-python/distro[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/libnacl[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
+ =dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+
[gentoo-commits] repo/gentoo:master commit in: dev-ml/merlin-extend/
commit: 8ee302c1133db9475349b38f25c640d8ad925ad2
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 22:18:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 22:18:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee302c1
dev-ml/merlin-extend: update OCaml subslot dep
Signed-off-by: Sam James gentoo.org>
.../{merlin-extend-0.3.ebuild => merlin-extend-0.3-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
similarity index 93%
rename from dev-ml/merlin-extend/merlin-extend-0.3.ebuild
rename to dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
index e15e2f21b2f..049701ee310 100644
--- a/dev-ml/merlin-extend/merlin-extend-0.3.ebuild
+++ b/dev-ml/merlin-extend/merlin-extend-0.3-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-DEPEND="dev-lang/ocaml:0/4.05.0"
+DEPEND="dev-lang/ocaml:0/4.05"
RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/cppo"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/dose3/
commit: 0d341788df5f53b0d05140232db0b77615a977ba
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 22:16:59 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 22:17:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d341788
dev-ml/dose3: update OCaml < dep
Signed-off-by: Sam James gentoo.org>
dev-ml/dose3/{dose3-5.0.1_p16-r2.ebuild => dose3-5.0.1_p16-r3.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
b/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
similarity index 98%
rename from dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
rename to dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
index b869201b21e..8a2d9bb0eca 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r3.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
"
RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt=]
- <=dev-lang/ocaml-4.09.0:=[ocamlopt=]
+ =dev-ml/extlib-1.7.0:=[ocamlopt=]
>=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=]
[gentoo-commits] repo/gentoo:master commit in: sys-libs/readline/, sys-libs/readline/files/
commit: be86ca1b22fb91e2ccc6e82719342b38d8ac2afe
Author: Mike Frysinger gentoo org>
AuthorDate: Wed Jun 9 22:06:54 2021 +
Commit: Mike Frysinger gentoo org>
CommitDate: Wed Jun 9 22:07:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be86ca1b
sys-libs/readline: add upstream fix for Windows cross-compiling
Signed-off-by: Mike Frysinger gentoo.org>
.../files/readline-8.1-windows-signals.patch | 23 ++
sys-libs/readline/readline-8.1_p1.ebuild | 1 +
2 files changed, 24 insertions(+)
diff --git a/sys-libs/readline/files/readline-8.1-windows-signals.patch
b/sys-libs/readline/files/readline-8.1-windows-signals.patch
new file mode 100644
index 000..2f818fc7f9c
--- /dev/null
+++ b/sys-libs/readline/files/readline-8.1-windows-signals.patch
@@ -0,0 +1,23 @@
+fix from upstream
+
+commit 4be5608573b2be2e31f3d2a01446e22e1c9d7839
+Author: Chet Ramey
+Date: Wed Jan 27 11:49:50 2021 -0500
+
+commit bash-20210122 snapshot
+
+diff --git a/lib/readline/signals.c b/lib/readline/signals.c
+index 0943c643b27d..ecaf699e9261 100644
+--- a/signals.c
b/signals.c
+@@ -266,8 +266,10 @@ _rl_handle_signal (int sig)
+ case SIGQUIT:
+ #endif
+
++#if defined (HAVE_POSIX_SIGNALS)
+ if (block_sig)
+ sigprocmask (SIG_BLOCK, , );
++#endif
+
+ rl_echo_signal_char (sig);
+ rl_cleanup_after_signal ();
diff --git a/sys-libs/readline/readline-8.1_p1.ebuild
b/sys-libs/readline/readline-8.1_p1.ebuild
index 944bdc74689..5cd7a3bdc21 100644
--- a/sys-libs/readline/readline-8.1_p1.ebuild
+++ b/sys-libs/readline/readline-8.1_p1.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-7.0-headers.patch
"${FILESDIR}"/${PN}-8.0-headers.patch
"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
+ "${FILESDIR}"/${PN}-8.1-windows-signals.patch
)
# Needed because we don't want the patches being unpacked
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/
commit: ab70179e6daf7d1b62ac54cfd268abba5a016da5
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:47:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:47:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab70179e
dev-ml/ppx_tools: add 6.3
Closes: https://bugs.gentoo.org/795039
Signed-off-by: Sam James gentoo.org>
dev-ml/ppx_tools/Manifest | 1 +
dev-ml/ppx_tools/ppx_tools-6.3.ebuild | 17 +
2 files changed, 18 insertions(+)
diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest
index 53e54129a94..5963a560f3b 100644
--- a/dev-ml/ppx_tools/Manifest
+++ b/dev-ml/ppx_tools/Manifest
@@ -1 +1,2 @@
DIST ppx_tools-6.2.tar.gz 46150 BLAKE2B
f8af2a1eee81d5a1e73ac606ab79d285c8c226533bcf715ed22386aecfaf51260fb9a5075d270675f1b601cb174b68d8c85556f418031a7b6bda06c4376fe443
SHA512
fc3943c69901ef46843355c3482d5a1481d05ee94fb0a344ec04101059a02cbaa76fed5742cfae82730edf378f2e140d859a5cf590653f85359255d451f07dc8
+DIST ppx_tools-6.3.tar.gz 18811 BLAKE2B
b1389dbe0c6fd855cafc8d64a9db550866317172909c2731f01acd412c6f8147f07e19a82d527187d0b211fca9eb2f2ad63bb53e8f375b0b8107c4e72371
SHA512
6a88f6f877f49ea8736aeca60673a19c52d5104ad9e2a3e56db3f71cd557d39df9c709c4e678ccf10263ff1f3e0504f4676227bd05ceba1e0294453a988a736c
diff --git a/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
new file mode 100644
index 000..1d025b5dacd
--- /dev/null
+++ b/dev-ml/ppx_tools/ppx_tools-6.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=$(ver_rs 2 '+')
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/alainfrisch/ppx_tools;
+SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/
commit: 431ced85b124ba5ee43b9b16cdd918d9502806ed
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:48:19 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:48:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431ced85
dev-ml/ppx_tools: require < OCaml 4.12 for older ppx_tools
Bug: https://bugs.gentoo.org/795039
Signed-off-by: Sam James gentoo.org>
dev-ml/ppx_tools/ppx_tools-6.2.ebuild | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
index 9ae7a218438..79491ecf97b 100644
--- a/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
+++ b/dev-ml/ppx_tools/ppx_tools-6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,12 +9,11 @@ MY_PV=$(ver_rs 2 '+')
DESCRIPTION="Tools for authors of ppx rewriters"
HOMEPAGE="https://github.com/alainfrisch/ppx_tools;
SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz ->
${P}.tar.gz"
+S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="+ocamlopt"
-DEPEND=""
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-$(ver_rs 2 '-')"
+BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
commit: 4053b0c70b4a586a5c5754497bf761d04284c9e6
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:44:16 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:44:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4053b0c7
dev-ml/camlp4: drop 4.08_p1-r1
The corresponding dev-lang/ocaml version doesn't exist.
Bug: https://bugs.gentoo.org/794898
Signed-off-by: Sam James gentoo.org>
dev-ml/camlp4/Manifest | 1 -
dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild | 49 --
2 files changed, 50 deletions(-)
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 61b2e54941b..7576021844b 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,5 +1,4 @@
DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B
068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854
SHA512
0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
-DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B
8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515
SHA512
1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B
2bf0fd0b4f22d21b9fa7e195a26f4dece56549c56d191480d5c874aac9422d2d4aa41e23e96c078f653f6da6bdbd186583cb02e857741fdb526b53b000b981bb
SHA512
71a8eed173013bdea61f7a268c82acaa1f5215aebbf4b638efba137760e849f9fede82f801aa14e5d6cc334d6e67d752988b15a36557b363a8feaf9ba1d1add4
DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B
d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e
SHA512
7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B
6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995
SHA512
8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
diff --git a/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
deleted file mode 100644
index ab9c9e3c267..000
--- a/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV=${PV/_p/+}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="System for writing extensible parsers for programming languages"
-HOMEPAGE="https://github.com/camlp4/camlp4;
-SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz ->
${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
-
-LICENSE="LGPL-2-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux"
-IUSE="+ocamlopt"
-
-DEPEND="dev-lang/ocaml:0/4.08[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild"
-
-QA_FLAGS_IGNORED='.*'
-
-PATCHES=(
- "${FILESDIR}/reload.patch"
- "${FILESDIR}/oc409.patch"
-)
-
-src_configure() {
- ./configure \
- --bindir="${EPREFIX}/usr/bin" \
- --libdir="$(ocamlc -where)" \
- --pkgdir="$(ocamlc -where)" \
- || die
-}
-
-src_compile() {
- # Increase stack limit to 11GiB to avoid stack overflow error.
- ulimit -s 1153
- emake byte
- use ocamlopt && emake native
-}
-
-src_install() {
- emake DESTDIR="${D}" install install-META
- dodoc CHANGES.md README.md
-}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
commit: 44fcb8adf6e4de019ed6bb7f3735e0b60ce5df3a
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:45:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:45:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44fcb8ad
dev-ml/camlp4: add 4.12
Bug: https://bugs.gentoo.org/794898
Signed-off-by: Sam James gentoo.org>
dev-ml/camlp4/Manifest | 1 +
dev-ml/camlp4/camlp4-4.12.ebuild | 46
2 files changed, 47 insertions(+)
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 7576021844b..05a69dfc98a 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -2,3 +2,4 @@ DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B
068c1016a75616811787eb480b61349a329609
DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B
2bf0fd0b4f22d21b9fa7e195a26f4dece56549c56d191480d5c874aac9422d2d4aa41e23e96c078f653f6da6bdbd186583cb02e857741fdb526b53b000b981bb
SHA512
71a8eed173013bdea61f7a268c82acaa1f5215aebbf4b638efba137760e849f9fede82f801aa14e5d6cc334d6e67d752988b15a36557b363a8feaf9ba1d1add4
DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B
d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e
SHA512
7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B
6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995
SHA512
8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
+DIST camlp4-4.12.tar.gz 650428 BLAKE2B
4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc
SHA512
0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.12.ebuild
new file mode 100644
index 000..7def8b41a1d
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4;
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+QA_FLAGS_IGNORED='.*'
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+ ./configure \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="$(ocamlc -where)" \
+ --pkgdir="$(ocamlc -where)" \
+ || die
+}
+
+src_compile() {
+ # Increase stack limit to 11GiB to avoid stack overflow error.
+ ulimit -s 1153
+ emake byte
+ use ocamlopt && emake native
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install-META
+ dodoc CHANGES.md README.md
+}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
commit: 660e8b9da0de345fde4d04c17e13b82d05f42dcf
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:41:32 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:41:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660e8b9d
dev-ml/camlp4: add subslot dep on OCaml major version
Needs to be exactly aligned with OCaml major version.
Closes: https://bugs.gentoo.org/794898
Signed-off-by: Sam James gentoo.org>
dev-ml/camlp4/{camlp4-4.05_p1.ebuild => camlp4-4.05_p1-r1.ebuild} | 4 ++--
dev-ml/camlp4/{camlp4-4.08_p1.ebuild => camlp4-4.08_p1-r1.ebuild} | 2 +-
dev-ml/camlp4/{camlp4-4.10_p1.ebuild => camlp4-4.10_p1-r1.ebuild} | 4 ++--
dev-ml/camlp4/{camlp4-4.11_p1.ebuild => camlp4-4.11_p1-r1.ebuild} | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
similarity index 92%
rename from dev-ml/camlp4/camlp4-4.05_p1.ebuild
rename to dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index e3f1c78d6c1..c7f37c50a7d 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/4.05[ocamlopt?]"
RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
similarity index 95%
rename from dev-ml/camlp4/camlp4-4.08_p1.ebuild
rename to dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
index 06769da466c..ab9c9e3c267 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1-r1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/${PV}"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux"
IUSE="+ocamlopt"
-DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/4.08[ocamlopt?]"
RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild
b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
similarity index 92%
rename from dev-ml/camlp4/camlp4-4.10_p1.ebuild
rename to dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
index b80025c98ba..53a6a66d6b4 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/4.10[ocamlopt?]"
RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
similarity index 95%
rename from dev-ml/camlp4/camlp4-4.11_p1.ebuild
rename to dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
index f50ced55ac7..7def8b41a1d 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
-DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/4.11[ocamlopt?]"
RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
dev-ml/ocamlbuild"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
commit: 32e83345fc4e7599a65ddb75942136307ea9c78d
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:43:42 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:43:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e83345
dev-ml/camlp4: add 4.09_p1
Bug: https://bugs.gentoo.org/794898
Signed-off-by: Sam James gentoo.org>
dev-ml/camlp4/Manifest | 1 +
dev-ml/camlp4/camlp4-4.09_p1.ebuild | 44 +
2 files changed, 45 insertions(+)
diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 44d3605c0dc..61b2e54941b 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,4 +1,5 @@
DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B
068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854
SHA512
0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B
8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515
SHA512
1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
+DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B
2bf0fd0b4f22d21b9fa7e195a26f4dece56549c56d191480d5c874aac9422d2d4aa41e23e96c078f653f6da6bdbd186583cb02e857741fdb526b53b000b981bb
SHA512
71a8eed173013bdea61f7a268c82acaa1f5215aebbf4b638efba137760e849f9fede82f801aa14e5d6cc334d6e67d752988b15a36557b363a8feaf9ba1d1add4
DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B
d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e
SHA512
7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B
6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995
SHA512
8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
diff --git a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
new file mode 100644
index 000..eefd80d28d0
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4;
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+ dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+ ./configure \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="$(ocamlc -where)" \
+ --pkgdir="$(ocamlc -where)" \
+ || die
+}
+
+src_compile() {
+ # Increase stack limit to 11GiB to avoid stack overflow error.
+ ulimit -s 1153
+ emake byte
+ use ocamlopt && emake native
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install-META
+ dodoc CHANGES.md README.md
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 2e76cc8b33f566bab28fad6f4efba99b18c03631
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:38:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:38:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e76cc8b
dev-lang/ocaml: adjust subslot to be major version
Should be bytecode compatible with non-major version changes. Makes it
a lot easier to give dependencies in e.g. camlp4 which needs to be
exactly aligned with the OCaml major version.
Bug: https://bugs.gentoo.org/794898
Acked-by: Alfredo Tupone gentoo.org>
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/{ocaml-4.05.0-r3.ebuild => ocaml-4.05.0-r5.ebuild} | 2 +-
dev-lang/ocaml/{ocaml-4.05.0-r4.ebuild => ocaml-4.05.0-r6.ebuild} | 2 +-
dev-lang/ocaml/{ocaml-4.09.0.ebuild => ocaml-4.09.0-r1.ebuild}| 2 +-
dev-lang/ocaml/{ocaml-4.10.2.ebuild => ocaml-4.10.2-r1.ebuild}| 2 +-
dev-lang/ocaml/{ocaml-4.11.2.ebuild => ocaml-4.11.2-r1.ebuild}| 2 +-
dev-lang/ocaml/{ocaml-4.12.0.ebuild => ocaml-4.12.0-r1.ebuild}| 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
index 69094b6cb10..36adb282101 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.
LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
index 1fd3049eff5..ae3120cad72 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.
LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.09.0.ebuild
rename to dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
index f74988668b8..14dc7a908b0 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.10.2.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.10.2.ebuild
rename to dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
index 208d8612d6a..e1ca18aa961 100644
--- a/dev-lang/ocaml/ocaml-4.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.11.2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
similarity index 98%
rename from dev-lang/ocaml/ocaml-4.11.2.ebuild
rename to dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
index e3298bdfc89..f1ad43dbf99 100644
--- a/dev-lang/ocaml/ocaml-4.11.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
commit: b7c22bd1951d46b7f4b68aa211665ccf5863e448
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:44:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:44:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c22bd1
dev-ml/camlp4: stabilize 4.09_p1
Bug: https://bugs.gentoo.org/794898
Signed-off-by: Sam James gentoo.org>
dev-ml/camlp4/camlp4-4.09_p1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
index eefd80d28d0..80481b707c6 100644
--- a/dev-ml/camlp4/camlp4-4.09_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux"
IUSE="+ocamlopt"
DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-fileutils/
commit: ec804ac6c48a59e463a80bf9fbe7cbf7b37f719c
Author: Rafael Kitover gmail com>
AuthorDate: Wed Jun 9 09:54:55 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:35:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec804ac6
dev-ml/ocaml-fileutils: add 0.6.3
No changes to ebuild.
Closes: https://bugs.gentoo.org/769233
Signed-off-by: Rafael Kitover gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21172
Signed-off-by: Sam James gentoo.org>
dev-ml/ocaml-fileutils/Manifest| 1 +
.../ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild | 31 ++
2 files changed, 32 insertions(+)
diff --git a/dev-ml/ocaml-fileutils/Manifest b/dev-ml/ocaml-fileutils/Manifest
index 215d6c3c647..da1779a20b3 100644
--- a/dev-ml/ocaml-fileutils/Manifest
+++ b/dev-ml/ocaml-fileutils/Manifest
@@ -1 +1,2 @@
DIST ocaml-fileutils-0.6.2.tar.bz2 43060 BLAKE2B
20828875a25b1a9d2a41bf495cda00b0ac753efa20111b32a9d2ca439a56e9f07bf0953d16ee9148cf065e204fa1d8d624eaa89f6f4ae7e1613fdaa7cb44fc24
SHA512
104c7389832f22ec189ce6f1596144b28dcaeea7d23d5b19d369c44e54326e97fcb7b4f4c4a8d2965523e63b35b594a1351b7e630dde590871efe512fe38853c
+DIST ocaml-fileutils-0.6.3.tar.bz2 43157 BLAKE2B
a9adf17d028abd664dbdec3fefa301a6b502941a6da4ef9c3ef02b876f187d224e404f6a9ffb5460035ba475154c60109a5218cb8b9bb36153ca791f8d218e7d
SHA512
2c5e75b894e9f5e3b003d61977a87f5c6964a89d844949eedc55f97c5875cc52052182420bbb4e73925d306479c66400df74e4adfccc5b2102347d13e99505cf
diff --git a/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild
b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild
new file mode 100644
index 000..72c2b68e413
--- /dev/null
+++ b/dev-ml/ocaml-fileutils/ocaml-fileutils-0.6.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DUNE_PKG_NAME="fileutils"
+
+inherit dune
+
+DESCRIPTION="Pure OCaml functions to manipulate real file (POSIX like) and
filename"
+HOMEPAGE="https://github.com/gildor478/ocaml-fileutils;
+SRC_URI="https://github.com/gildor478/${PN}/releases/download/v${PV}/${DUNE_PKG_NAME}-v${PV}.tbz
-> ${P}.tar.bz2"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-ml/ounit2-2.0.0
+ >=dev-ml/stdlib-shims-0.2.0"
+
+DOCS=( "README.md" "CHANGES.md" "LICENSE.txt" )
+
+S="${WORKDIR}/${DUNE_PKG_NAME}-v${PV}"
+
+src_prepare() {
+ default
+
+ # Port to dev-ml/ounit2
+ sed -i -e 's/oUnit/ounit2/' test/dune || die
+}
