diff --git a/acct-group/nitter/metadata.xml b/acct-group/nitter/metadata.xml
new file mode 100644
index 0000000000..7ebbd03347
--- /dev/null
+++ b/acct-group/nitter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/acct-group/nitter/nitter-0.ebuild b/acct-group/nitter/nitter-0.ebuild
new file mode 100644
index 0000000000..b0c893b76f
--- /dev/null
+++ b/acct-group/nitter/nitter-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-group
+
+ACCT_GROUP_ID=-1
diff --git a/acct-user/nitter/metadata.xml b/acct-user/nitter/metadata.xml
new file mode 100644
index 0000000000..7ebbd03347
--- /dev/null
+++ b/acct-user/nitter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
diff --git a/acct-user/nitter/nitter-0.ebuild b/acct-user/nitter/nitter-0.ebuild
new file mode 100644
index 0000000000..6a24573faf
--- /dev/null
+++ b/acct-user/nitter/nitter-0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit acct-user
+
+ACCT_USER_ID=-1
+ACCT_USER_GROUPS=( nitter )
+
+acct-user_add_deps
diff --git a/app-admin/akita/Manifest b/app-admin/akita/Manifest
index b454730495..f1b58f3aa6 100644
--- a/app-admin/akita/Manifest
+++ b/app-admin/akita/Manifest
@@ -1 +1 @@
-DIST akita-0.1.4.tar.gz 212866 BLAKE2B d6a32943eff8eb110fd4026378ecf04443a0792386ad755e28efeeba983f501f735bdae93bf798413caddec30764c9b6a2521d605e88f84a15081994361ce3ad SHA512 aeb5f6c21b4cb69c9adf58516db6ad951db562f5a12ff71f3816b9a962c4c2503120f6140f53b82893c441565676f3bc41a19ea2301728502d5a2c191372fdba
+DIST akita-0.1.4.gh.tar.gz 212866 BLAKE2B d6a32943eff8eb110fd4026378ecf04443a0792386ad755e28efeeba983f501f735bdae93bf798413caddec30764c9b6a2521d605e88f84a15081994361ce3ad SHA512 aeb5f6c21b4cb69c9adf58516db6ad951db562f5a12ff71f3816b9a962c4c2503120f6140f53b82893c441565676f3bc41a19ea2301728502d5a2c191372fdba
diff --git a/app-admin/akita/akita-0.1.4.ebuild b/app-admin/akita/akita-0.1.4.ebuild
index 64d9a39935..3362df7a40 100644
--- a/app-admin/akita/akita-0.1.4.ebuild
+++ b/app-admin/akita/akita-0.1.4.ebuild
@@ -1,17 +1,17 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
PYTHON_REQ_USE="ncurses"
-
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="An HTTP log monitoring tool for your terminal"
HOMEPAGE="https://github.com/michael-lazar/Akita https://pypi.org/project/akita/"
-SRC_URI="https://github.com/michael-lazar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/Akita-${PV}"
+SRC_URI="https://github.com/michael-lazar/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN^}-${PV}"
LICENSE="MIT"
SLOT="0"
diff --git a/app-i18n/scim-canna/Manifest b/app-i18n/scim-canna/Manifest
new file mode 100644
index 0000000000..d2bfe27c3b
--- /dev/null
+++ b/app-i18n/scim-canna/Manifest
@@ -0,0 +1 @@
+DIST scim-canna-1.0.1.tar.gz 516186 BLAKE2B 03b977e841d6263f6c980e8e729122ca4ff7c9a0966f6f9daf57543250e7119a84ddfb7805804e3c5afaecba91d50d21448f49335d5a28cb967de8370b9f5dd9 SHA512 711b67211c9d1f4cb8ca09b88d455718607aa2d99e47a753fa8d71d2e1f0df8c649b64d08149785eeaa98d1399b9ca92e3df7e1be8f150ce99f28f82491b8bc1
diff --git a/app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch b/app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch
new file mode 100644
index 0000000000..d9a99010a9
--- /dev/null
+++ b/app-i18n/scim-canna/files/scim-canna-1.0.1-fix_ftbfs_gtk3.patch
@@ -0,0 +1,201 @@
+--- a/src/scim_canna_imengine_setup.cpp
++++ b/src/scim_canna_imengine_setup.cpp
+@@ -152,7 +152,9 @@
+ // Internal data declaration.
+ static bool __have_changed = true;
+
++#if !GTK_CHECK_VERSION(2, 12, 0)
+ static GtkTooltips * __widget_tooltips = 0;
++#endif
+
+ static BoolConfigData __config_bool_common [] =
+ {
+@@ -284,11 +286,17 @@
+ entry);
+ gtk_widget_show (entry->widget);
+
++#if !GTK_CHECK_VERSION(2, 12, 0)
+ if (!__widget_tooltips)
+ __widget_tooltips = gtk_tooltips_new();
++#endif
+ if (entry->tooltip)
++#if GTK_CHECK_VERSION(2, 12, 0)
++ gtk_widget_set_tooltip_text (entry->widget, _(entry->tooltip));
++#else
+ gtk_tooltips_set_tip (__widget_tooltips, entry->widget,
+ _(entry->tooltip), NULL);
++#endif
+
+ return entry->widget;
+ }
+@@ -324,11 +332,17 @@
+ (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+ (GtkAttachOptions) (GTK_FILL), 4, 4);
+
++#if !GTK_CHECK_VERSION(2, 12, 0)
+ if (!__widget_tooltips)
+ __widget_tooltips = gtk_tooltips_new();
++#endif
+ if (entry->tooltip)
++#if GTK_CHECK_VERSION(2, 12, 0)
++ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip));
++#else
+ gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
+ _(entry->tooltip), NULL);
++#endif
+
+ return GTK_WIDGET (entry->widget);
+ }
+@@ -351,31 +365,53 @@
+ (GtkAttachOptions) (GTK_FILL), 4, 4);
+ gtk_widget_show (label);
+
++#if GTK_CHECK_VERSION(2, 4, 0)
++ entry->widget = gtk_combo_box_text_new_with_entry ();
++ gtk_label_set_mnemonic_widget (GTK_LABEL (label),
++ gtk_bin_get_child (GTK_BIN (entry->widget)));
++ gtk_editable_set_editable (GTK_EDITABLE (gtk_bin_get_child (GTK_BIN (entry->widget))), FALSE);
++#else
+ entry->widget = gtk_combo_new ();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (label),
+ GTK_COMBO (entry->widget)->entry);
+ gtk_combo_set_value_in_list (GTK_COMBO (entry->widget), TRUE, FALSE);
+ gtk_combo_set_case_sensitive (GTK_COMBO (entry->widget), TRUE);
+- gtk_entry_set_editable (GTK_ENTRY (GTK_COMBO (entry->widget)->entry),
++ gtk_editable_set_editable (GTK_EDITABLE (GTK_COMBO (entry->widget)->entry),
+ FALSE);
++#endif
+ gtk_widget_show (GTK_WIDGET (entry->widget));
+ gtk_table_attach (GTK_TABLE (table), GTK_WIDGET (entry->widget),
+ 1, 2, idx, idx + 1,
+ (GtkAttachOptions) (GTK_FILL|GTK_EXPAND),
+ (GtkAttachOptions) (GTK_FILL), 4, 4);
++#if GTK_CHECK_VERSION(2, 4, 0)
++ g_object_set_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (entry->widget))),
++ DATA_POINTER_KEY,
++ (gpointer) candidates_p);
++ g_signal_connect ((gpointer) gtk_bin_get_child (GTK_BIN (entry->widget)), "changed",
++ G_CALLBACK (on_default_combo_changed),
++ entry);
++#else
+ g_object_set_data (G_OBJECT (GTK_COMBO (entry->widget)->entry),
+ DATA_POINTER_KEY,
+ (gpointer) candidates_p);
+-
+ g_signal_connect ((gpointer) GTK_COMBO (entry->widget)->entry, "changed",
+ G_CALLBACK (on_default_combo_changed),
+ entry);
++#endif
++
+
++#if !GTK_CHECK_VERSION(2, 12, 0)
+ if (!__widget_tooltips)
+ __widget_tooltips = gtk_tooltips_new();
++#endif
+ if (entry->tooltip)
++#if GTK_CHECK_VERSION(2, 12, 0)
++ gtk_widget_set_tooltip_text (GTK_WIDGET (entry->widget), _(entry->tooltip));
++#else
+ gtk_tooltips_set_tip (__widget_tooltips, GTK_WIDGET (entry->widget),
+ _(entry->tooltip), NULL);
++#endif
+
+ return GTK_WIDGET (entry->widget);
+ }
+@@ -403,11 +439,17 @@
+ {
+ GtkWidget *vbox, *frame, *table, *check, *widget;
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
++#else
+ vbox = gtk_vbox_new (FALSE, 0);
++#endif
+ gtk_widget_show (vbox);
+
++#if !GTK_CHECK_VERSION(2, 12, 0)
+ if (!__widget_tooltips)
+ __widget_tooltips = gtk_tooltips_new();
++#endif
+
+ /* specify initialize file name */
+ frame = gtk_frame_new ("");
+@@ -455,7 +497,11 @@
+ {
+ GtkWidget *vbox, *table;
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
++#else
+ vbox = gtk_vbox_new (FALSE, 0);
++#endif
+ gtk_widget_show (vbox);
+
+ table = gtk_table_new (2, 2, FALSE);
+@@ -480,7 +526,11 @@
+ GtkWidget *vbox, *label;
+ gchar str[256];
+
++#if GTK_CHECK_VERSION(3, 0, 0)
++ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
++#else
+ vbox = gtk_vbox_new (FALSE, 0);
++#endif
+ gtk_widget_show (vbox);
+
+ g_snprintf (
+@@ -547,8 +597,23 @@
+ }
+
+ static void
+-setup_combo_value (GtkCombo *combo, const String & str)
++setup_combo_value (GtkWidget *combo, const String & str)
+ {
++#if GTK_CHECK_VERSION(2, 4, 0)
++ ComboConfigCandidate *data
++ = static_cast
++ (g_object_get_data (G_OBJECT (gtk_bin_get_child (GTK_BIN (combo))),
++ DATA_POINTER_KEY));
++
++ gint default_index = -1;
++ for (unsigned int i = 0; data[i].label; i++) {
++ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _(data[i].label));
++ if (!strcmp (data[i].data, str.c_str ()))
++ default_index = i;
++ }
++ if (default_index != -1)
++ gtk_combo_box_set_active (GTK_COMBO_BOX (combo), default_index);
++#else
+ GList *list = NULL;
+ const char *defval = NULL;
+
+@@ -563,11 +628,12 @@
+ defval = _(data[i].label);
+ }
+
+- gtk_combo_set_popdown_strings (combo, list);
++ gtk_combo_set_popdown_strings (GTK_COMBO (combo), list);
+ g_list_free (list);
+
+ if (defval)
+- gtk_entry_set_text (GTK_ENTRY (combo->entry), defval);
++ gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)->entry), defval);
++#endif
+ }
+
+ static void
+@@ -582,8 +648,13 @@
+
+ for (unsigned int i = 0; i < __config_string_common_num; i++) {
+ StringConfigData &entry = __config_string_common[i];
++#if GTK_CHECK_VERSION(2, 12, 0)
++ if (entry.widget && GTK_IS_COMBO_BOX (entry.widget))
++ setup_combo_value (entry.widget, entry.value);
++#else
+ if (entry.widget && GTK_IS_COMBO (entry.widget))
+- setup_combo_value (GTK_COMBO (entry.widget), entry.value);
++ setup_combo_value (entry.widget, entry.value);
++#endif
+ else if (entry.widget && GTK_IS_ENTRY (entry.widget))
+ gtk_entry_set_text (GTK_ENTRY (entry.widget),
+ entry.value.c_str ());
diff --git a/app-i18n/scim-canna/metadata.xml b/app-i18n/scim-canna/metadata.xml
new file mode 100644
index 0000000000..0433bcab3e
--- /dev/null
+++ b/app-i18n/scim-canna/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ Alessandro Barbieri
+ lssndrbarbieri@gmail.com
+
+
diff --git a/app-i18n/scim-canna/scim-canna-1.0.1.ebuild b/app-i18n/scim-canna/scim-canna-1.0.1.ebuild
new file mode 100644
index 0000000000..2428278475
--- /dev/null
+++ b/app-i18n/scim-canna/scim-canna-1.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="SCIM IMEngine module using Canna"
+HOMEPAGE="https://osdn.net/projects/scim-imengine"
+SRC_URI="https://free.nchc.org.tw/osdn//scim-imengine/29155/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+RDEPEND="
+ app-i18n/canna
+ app-i18n/scim
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/libltdl
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-fix_ftbfs_gtk3.patch" )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myargs=(
+ --disable-static
+ --enable-shared
+ $(use_enable debug)
+ )
+ econf "${myargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-misc/mat2/mat2-0.12.4.ebuild b/app-misc/mat2/mat2-0.12.4.ebuild
index 3e728eb439..b85df8ffc5 100644
--- a/app-misc/mat2/mat2-0.12.4.ebuild
+++ b/app-misc/mat2/mat2-0.12.4.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PYTHON_COMPAT=(python3_{8..10})
-PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=(python3_{8..11})
+PYTHON_REQ_USE="xml(+)"
inherit distutils-r1 optfeature
diff --git a/dev-R/R_utils/R_utils-2.12.0.ebuild b/dev-R/R_utils/R_utils-2.12.0.ebuild
index 2a72049d1b..6a2482d30f 100644
--- a/dev-R/R_utils/R_utils-2.12.0.ebuild
+++ b/dev-R/R_utils/R_utils-2.12.0.ebuild
@@ -3,30 +3,20 @@
EAPI=7
-inherit R-packages edo
+inherit R-packages
DESCRIPTION="Various Programming Utilities"
KEYWORDS="~amd64"
LICENSE='LGPL-2.1+'
CRAN_PN="R.utils"
-IUSE="test"
-RESTRICT="!test? ( test )"
SRC_URI="mirror://cran/src/contrib/${CRAN_PN}_${PV}.tar.gz"
DEPEND="
>=dev-R/R_oo-1.24.0
>=dev-R/R_methodsS3-1.8.1
- test? ( >=dev-R/digest-0.6.10 )
"
SUGGESTED_PACKAGES="
>=dev-R/digest-0.6.10
"
-
-src_test() {
- cd "${WORKDIR}/${P}/tests" || die
- for i in *.R; do
- R_LIBS="${T}/R" edo Rscript --vanilla $i
- done
-}
diff --git a/dev-R/nloptr/nloptr-2.0.3.ebuild b/dev-R/nloptr/nloptr-2.0.3-r1.ebuild
similarity index 95%
rename from dev-R/nloptr/nloptr-2.0.3.ebuild
rename to dev-R/nloptr/nloptr-2.0.3-r1.ebuild
index feb76ef4d8..b8a705a320 100644
--- a/dev-R/nloptr/nloptr-2.0.3.ebuild
+++ b/dev-R/nloptr/nloptr-2.0.3-r1.ebuild
@@ -16,6 +16,7 @@ DEPEND="
test? (
dev-R/xml2
)
+ >=sci-libs/nlopt-2.7.0
"
SUGGESTED_PACKAGES="
diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch b/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
deleted file mode 100644
index a4f4507cf5..0000000000
--- a/dev-java/gluegen/files/gluegen-2.2.4-dont-test-archive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/make/build-test.xml
-+++ b/make/build-test.xml
-@@ -614,9 +614,11 @@ chmod 644 ${results}/* \${line.separator}
-
-
-
-+
-
-
-
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff
new file mode 100644
index 0000000000..9de0e28be6
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-add-mips64el-mipsn32-support.diff
@@ -0,0 +1,229 @@
+Description: Add mips64(el) and mipsn32(el) support
+Author: YunQiang Su , Dejan Latinovic
+Forwarded: no
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -298,6 +298,30 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -340,7 +364,7 @@
+
+
+
+-
++
+
+
+
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -47,6 +47,10 @@
+ - isLinuxHppa
+ - isLinuxMips
+ - isLinuxMipsel
++ - isLinuxMipsn32
++ - isLinuxMipsn32el
++ - isLinuxMips64
++ - isLinuxMipsn64el
+ - isLinuxPpc
+ - isLinuxPpc64
+ - isLinuxPpc64le
+@@ -135,6 +139,10 @@
+ - compiler.cfg.linux.hppa
+ - compiler.cfg.linux.mips
+ - compiler.cfg.linux.mipsel
++ - compiler.cfg.linux.mipsn32
++ - compiler.cfg.linux.mipsn32el
++ - compiler.cfg.linux.mips64
++ - compiler.cfg.linux.mips64el
+ - compiler.cfg.linux.ppc
+ - compiler.cfg.linux.ppc64
+ - compiler.cfg.linux.ppc64le
+@@ -160,6 +168,10 @@
+ - linker.cfg.linux.hppa
+ - linker.cfg.linux.mips
+ - linker.cfg.linux.mipsel
++ - linker.cfg.linux.mipsn32
++ - linker.cfg.linux.mipsn32el
++ - linker.cfg.linux.mips64
++ - linker.cfg.linux.mips64el
+ - linker.cfg.linux.ppc
+ - linker.cfg.linux.ppc64le
+ - linker.cfg.linux.s390
+@@ -420,6 +432,42 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -639,6 +687,10 @@
+
+
+
++
++
++
++
+
+
+
+@@ -721,6 +773,22 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -757,7 +825,7 @@
+
+
+
+-
++
+
+
+
+@@ -1308,6 +1376,18 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -1549,6 +1629,34 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -1591,7 +1699,7 @@
+
+
+
+-
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff
new file mode 100644
index 0000000000..a474552cda
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-armhf.diff
@@ -0,0 +1,62 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -262,10 +262,16 @@
+
+
+
+-
+-
+-
+-
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -328,7 +334,7 @@
+
+
+
+-
++
+
+
+
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -1032,7 +1032,7 @@
+ - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
+ - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
+ for official JogAmp builds! -->
+-
++
+
+
+
+@@ -1270,7 +1270,7 @@
+ - lib/gluegen-cpptasks-linux-armv6.xml (armv5te + softfp), or
+ - lib/gluegen-cpptasks-linux-armv6hf.xml (armv6 + hardfp)
+ for official JogAmp builds! -->
+-
++
+
+
+
+@@ -1286,6 +1286,9 @@
+
+
+
++
++
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff
new file mode 100644
index 0000000000..e3fb75f9a4
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-java-version-check.diff
@@ -0,0 +1,28 @@
+Description: Disables the Java version check since the JRE in Debian always
+ meets the minimum requirement and the check routinely breaks with the latest JREs.
+Author: Emmanuel Bourg
+Forwarded: not-needed
+--- a/make/jogamp-env.xml
++++ b/make/jogamp-env.xml
+@@ -45,21 +45,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff
new file mode 100644
index 0000000000..ffeb5d5bea
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-disable-static-linking.diff
@@ -0,0 +1,42 @@
+Description: disable static linking for native libraries.
+Author: Gilles Filippini
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -1262,20 +1262,14 @@
+
+
+
+-
+-
+
+
+
+
+-
+-
+
+
+
+
+-
+-
+
+
+
+
+
+
+
+
+
+@@ -1138,9 +1138,9 @@
+
+
+
+-
++ includes="${archive.name}/**" />-->
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff b/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff
new file mode 100644
index 0000000000..7ba4b0e234
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-disable_git_call.diff
@@ -0,0 +1,17 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -70,14 +70,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
similarity index 91%
rename from dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
rename to dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
index 2e4ed462f6..0a06e96c57 100644
--- a/dev-java/gluegen/files/gluegen-2.2.4-dont-strip.patch
+++ b/dev-java/gluegen/files/gluegen-2.3.2-dont-strip.patch
@@ -1,6 +1,6 @@
--- a/make/gluegen-cpptasks-base.xml
+++ b/make/gluegen-cpptasks-base.xml
-@@ -1511,17 +1511,6 @@
+@@ -1872,16 +1872,6 @@
- Helper strip.libraries for stripping off debug information
-->
@@ -12,7 +12,6 @@
-
-
-
--
-
-
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch b/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch
new file mode 100644
index 0000000000..b02629a603
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-fix-alpha-build-config.patch
@@ -0,0 +1,11 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -334,7 +334,7 @@
+
+
+
+-
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff b/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff
new file mode 100644
index 0000000000..19de9401b2
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-fix-arm64-build-config.diff
@@ -0,0 +1,75 @@
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -316,6 +316,12 @@
+
+
+
++
++
++
++
++
++
+
+
+
+@@ -334,7 +340,7 @@
+
+
+
+-
++
+
+
+
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -50,6 +50,7 @@
+ - isLinuxPpc
+ - isLinuxPpc64
+ - isLinuxPpc64le
++ - isLinuxAarch64
+ - isLinuxs390
+ - isLinuxs390x
+ - isLinuxSparc
+@@ -137,6 +138,7 @@
+ - compiler.cfg.linux.ppc
+ - compiler.cfg.linux.ppc64
+ - compiler.cfg.linux.ppc64le
++ - compiler.cfg.linux.aarch64
+ - compiler.cfg.linux.s390
+ - compiler.cfg.linux.s390x
+ - compiler.cfg.linux.sparc
+@@ -440,6 +442,15 @@
+
+
+
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -626,6 +637,7 @@
+
+
+
++
+
+
+
+@@ -1511,7 +1523,7 @@
+
+
+
+-
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch b/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch
new file mode 100644
index 0000000000..03c371a374
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-fix_gcc-10.patch
@@ -0,0 +1,18 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee
+Bug-Debian: https://bugs.debian.org/957276
+Forwarded: no
+
+--- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
++++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1.h
+@@ -299,9 +299,6 @@ MYAPI MYAPIConfig * MYAPIENTRY typeTest
+ #define HUGE_VALF_3 ((int) 1e53)
+ #define DOUBLE_DEFINE_BRACKETS_3 HUGE_VALF_3
+
+-size_t unsigned_size_t_1;
+-ptrdiff_t a_signed_pointer_t_1;
+-
+ MYAPI int32_t MYAPIENTRY typeTestInt32T(const int32_t i1, int32_t i2);
+ MYAPI uint32_t MYAPIENTRY typeTestUInt32T(const uint32_t ui1, uint32_t ui2);
+ MYAPI int64_t MYAPIENTRY typeTestInt64T(const int64_t i1, int64_t i2);
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff b/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff
new file mode 100644
index 0000000000..4220216246
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-hideException.diff
@@ -0,0 +1,18 @@
+--- a/src/java/com/jogamp/common/os/Platform.java
++++ b/src/java/com/jogamp/common/os/Platform.java
+@@ -305,15 +305,6 @@ public class Platform extends PlatformPr
+ _USE_TEMP_JAR_CACHE[0] = ( OS_TYPE != OSType.ANDROID ) && ( null != platformClassJarURI ) &&
+ PropertyAccess.getBooleanProperty(useTempJarCachePropName, true, true);
+
+- // load GluegenRT native library
+- if(_USE_TEMP_JAR_CACHE[0] && TempJarCache.initSingleton()) {
+- try {
+- JNILibLoaderBase.addNativeJarLibs(new Class>[] { jogamp.common.Debug.class }, null);
+- } catch (final Exception e0) {
+- // IllegalArgumentException, IOException
+- System.err.println("Caught "+e0.getClass().getSimpleName()+": "+e0.getMessage()+", while JNILibLoaderBase.addNativeJarLibs(..)");
+- }
+- }
+ DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false, cl);
+
+ // JVM bug workaround
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch b/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch
new file mode 100644
index 0000000000..f51157d185
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-java10-compatibility.patch
@@ -0,0 +1,263 @@
+Description: Fixes the build failure with Java 10
+Author: Emmanuel Bourg
+Forwarded: no
+--- a/src/java/net/highteq/nativetaglet/NativeTaglet.java
++++ /dev/null
+@@ -1,237 +0,0 @@
+-package net.highteq.nativetaglet;
+-
+-import com.sun.tools.doclets.Taglet;
+-import com.sun.javadoc.*;
+-
+-import java.util.Map;
+-import java.util.Properties;
+-import java.util.Iterator;
+-import java.io.InputStream;
+-import java.net.URL;
+-import java.net.MalformedURLException;
+-
+-public class NativeTaglet implements Taglet
+-{
+- private Properties mapping= null;
+- private static final String NAME = "native";
+-
+- /**
+- * Return the name of this custom tag.
+- */
+- @Override
+- public String getName()
+- {
+- return NAME;
+- }
+-
+- /**
+- * @return true since this tag can be used in a field
+- * doc comment
+- */
+- @Override
+- public boolean inField()
+- {
+- return true;
+- }
+-
+- /**
+- * @return true since this tag can be used in a constructor
+- * doc comment
+- */
+- @Override
+- public boolean inConstructor()
+- {
+- return true;
+- }
+-
+- /**
+- * @return true since this tag can be used in a method
+- * doc comment
+- */
+- @Override
+- public boolean inMethod()
+- {
+- return true;
+- }
+-
+- /**
+- * @return true since this tag can be used in an overview
+- * doc comment
+- */
+- @Override
+- public boolean inOverview()
+- {
+- return true;
+- }
+-
+- /**
+- * @return true since this tag can be used in a package
+- * doc comment
+- */
+- @Override
+- public boolean inPackage()
+- {
+- return true;
+- }
+-
+- /**
+- * @return true since this
+- */
+- @Override
+- public boolean inType()
+- {
+- return true;
+- }
+-
+- /**
+- * Will return true since this is an inline tag.
+- *
+- * @return true since this is an inline tag.
+- */
+-
+- @Override
+- public boolean isInlineTag()
+- {
+- return true;
+- }
+-
+- /**
+- * Register this Taglet.
+- *
+- * @param tagletMap the map to register this tag to.
+- */
+- public static void register(final Map tagletMap)
+- {
+- final NativeTaglet tag = new NativeTaglet();
+- final Taglet t = (Taglet) tagletMap.get(tag.getName());
+- if (t != null)
+- {
+- tagletMap.remove(tag.getName());
+- }
+- tagletMap.put(tag.getName(), tag);
+- }
+-
+- /**
+- * Given the Tag representation of this custom
+- * tag, return its string representation.
+- *
+- * @param tag the Tag representation of this custom tag.
+- */
+- @Override
+- public String toString(final Tag tag)
+- {
+- String text= tag.text().trim();
+- if(mapping== null)
+- {
+- mapping= new Properties();
+- InputStream in= null;
+- try
+- {
+- URL url;
+- try
+- {
+- url = new URL(System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
+- }
+- catch (final MalformedURLException e)
+- {
+- url = new URL("file:"+System.getProperty("nativetaglet.mapping","file:native-taglet.properties"));
+- }
+- in= url.openStream();
+- mapping.load(in);
+- }
+- catch (final Exception e)
+- {
+- System.err.println("[NATIVE TAGLET] Could not read mapping file");
+- System.err.println("-->");
+- e.printStackTrace(System.err);
+- System.err.println("<--");
+- System.err.println("[NATIVE TAGLET] !!! NO LINKS WILL BE GENERATED !!!");
+- }
+- finally
+- {
+- if(in!=null) try{ in.close(); }catch(final Exception ignore){}
+- }
+- }
+-
+- if(mapping!=null)
+- {
+- // First check to see whether this key exists in the mapping
+- String url = mapping.getProperty(text);
+- if (url == null) {
+- // Try iterating the keySet seeing if we can find a partial match
+- // In the OpenGL spec this handles the case of glVertex -> glVertex3f
+- for(final Iterator i= mapping.keySet().iterator(); i.hasNext();) {
+- final String name= (String) i.next();
+- if (hasOpenGLSuffix(text, name)) {
+- url = mapping.getProperty(name);
+- break;
+- }
+- }
+- }
+- if (url != null) {
+- url = mapping.getProperty("nativetaglet.baseUrl", "") + url;
+- text = "" + text + "";
+- }
+- }
+- return text;
+- }
+-
+- private static final String[] openGLSuffixes = {
+- "b",
+- "s",
+- "i",
+- "f",
+- "d",
+- "ub",
+- "us",
+- "ui",
+- "bv",
+- "sv",
+- "iv",
+- "fv",
+- "dv",
+- "ubv",
+- "usv",
+- "uiv"
+- };
+- private static boolean hasOpenGLSuffix(final String name,
+- final String baseName) {
+- if (!name.startsWith(baseName)) {
+- return false;
+- }
+- for (int i = 0; i < openGLSuffixes.length; i++) {
+- final String suffix = openGLSuffixes[i];
+- if (name.endsWith(suffix)) {
+- // First see whether it's a simple concatenation
+- if (name.equals(baseName + suffix)) {
+- return true;
+- }
+- // Now chop prefix and suffix off and see whether the
+- // resulting is a number
+- try {
+- final String tmp = name.substring(baseName.length(),
+- name.length() - suffix.length());
+- if (tmp.length() == 1 &&
+- Character.isDigit(tmp.charAt(0))) {
+- return true;
+- }
+- } catch (final IndexOutOfBoundsException e) {
+- }
+- }
+- }
+- return false;
+- }
+-
+- /**
+- * This method should not be called since arrays of inline tags do not
+- * exist. Method {@link #tostring(Tag)} should be used to convert this
+- * inline tag to a string.
+- *
+- * @param tags the array of Tags representing of this custom tag.
+- */
+- @Override
+- public String toString(final Tag[] tags)
+- {
+- return null;
+- }
+-}
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -466,9 +466,6 @@
+
+
+
+-
+-
+-
+
+
+
+@@ -746,6 +743,7 @@
+
+
+
+
+
++
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff b/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff
new file mode 100644
index 0000000000..a39a2b145b
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-missing-arch-symbol.diff
@@ -0,0 +1,39 @@
+--- a/make/stub_includes/platform/glibc-compat-symbols.h
++++ b/make/stub_includes/platform/glibc-compat-symbols.h
+@@ -15,35 +15,7 @@
+ *
+ * Check build-in macro definitions via 'gcc -dM -E - < /dev/null'
+ */
+-#if defined(__linux__) /* Actually we like to test whether we link against GLIBC .. */
+- #if defined(__GNUC__)
+- #if defined(__aarch64__)
+- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
+- #elif defined(__arm__)
+- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.4");
+- #elif defined(__amd64__)
+- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
+- #else
+- #define GLIBC_COMPAT_SYMBOL(FFF) __asm__(".symver " #FFF "," #FFF "@GLIBC_2.0");
+- #endif /*__amd64__*/
+- #elif defined(__clang__)
+- #if defined(__aarch64__)
+- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
+- #elif defined(__arm__)
+- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.4");
+- #elif defined(__amd64__)
+- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.2.5");
+- #else
+- #define GLIBC_COMPAT_SYMBOL(FFF) asm(".symver " #FFF "," #FFF "@GLIBC_2.0");
+- #endif /*__amd64__*/
+- #else
+- #warning GLIBC_COMPAT_SYMBOL not supported with current compiler on GNU/Linux
+- #define GLIBC_COMPAT_SYMBOL(FFF)
+- #endif
+-#else
+- #warning GLIBC_COMPAT_SYMBOL not supported with target OS
+- #define GLIBC_COMPAT_SYMBOL(FFF)
+-#endif
++#define GLIBC_COMPAT_SYMBOL(FFF)
+
+ GLIBC_COMPAT_SYMBOL(memcpy)
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff
new file mode 100644
index 0000000000..6dfa9b83f2
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-non-linux-support.diff
@@ -0,0 +1,16 @@
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -292,7 +292,12 @@
+
+
+
+-
++
++
++
++
++
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff
new file mode 100644
index 0000000000..b1dd58a135
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-ppc64el-support.diff
@@ -0,0 +1,207 @@
+Description: add support for ppc64el arch.
+Author: Gilles Filippini
+--- /dev/null
++++ b/make/scripts/make.gluegen.all.linux-ppc64le.sh
+@@ -0,0 +1,24 @@
++#! /bin/sh
++
++# -Dc.compiler.debug=true \
++# -Dgluegen.cpptasks.detected.os=true \
++# -DisUnix=true \
++# -DisLinux=true \
++# -DisLinuxX86=true \
++# -DisX11=true \
++
++MACHINE=ppc64le
++ARCH=ppc64el
++TRIPLET=powerpc64le-linux-gnu
++
++export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
++
++export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
++
++#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
++export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
++
++ant \
++ -Drootrel.build=build-linux-$MACHINE \
++ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
+--- a/make/gluegen-cpptasks-base.xml
++++ b/make/gluegen-cpptasks-base.xml
+@@ -48,6 +48,8 @@
+ - isLinuxMips
+ - isLinuxMipsel
+ - isLinuxPpc
++ - isLinuxPpc64
++ - isLinuxPpc64le
+ - isLinuxs390
+ - isLinuxs390x
+ - isLinuxSparc
+@@ -133,6 +135,8 @@
+ - compiler.cfg.linux.mips
+ - compiler.cfg.linux.mipsel
+ - compiler.cfg.linux.ppc
++ - compiler.cfg.linux.ppc64
++ - compiler.cfg.linux.ppc64le
+ - compiler.cfg.linux.s390
+ - compiler.cfg.linux.s390x
+ - compiler.cfg.linux.sparc
+@@ -155,6 +159,7 @@
+ - linker.cfg.linux.mips
+ - linker.cfg.linux.mipsel
+ - linker.cfg.linux.ppc
++ - linker.cfg.linux.ppc64le
+ - linker.cfg.linux.s390
+ - linker.cfg.linux.s390x
+ - linker.cfg.linux.sparc
+@@ -417,6 +422,24 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -601,6 +624,8 @@
+
+
+
++
++
+
+
+
+@@ -683,6 +708,14 @@
+
+
+
++
++
++
++
++
++
++
++
+
+
+
+@@ -707,7 +740,7 @@
+
+
+
+-
++
+
+
+
+@@ -1268,6 +1301,12 @@
+
+
+
++
++
++
++
++
++
+
+
+
+@@ -1505,6 +1544,20 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -1526,7 +1579,7 @@
+
+
+
+-
++
+
+
+
+--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
++++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
+@@ -522,6 +522,7 @@ public abstract class PlatformPropsImpl
+ * linux-aarch64
+ * linux-amd64
+ * linux-ppc64
++ * linux-ppc64le
+ * linux-mips64
+ * linux-ia64
+ * linux-sparcv9
+@@ -578,7 +579,7 @@ public abstract class PlatformPropsImpl
+ _and_arch_tmp = "amd64";
+ break;
+ case PPC64:
+- _and_arch_tmp = "ppc64";
++ _and_arch_tmp = littleEndian ? "ppc64le" : "ppc64";
+ break;
+ case MIPS_64:
+ _and_arch_tmp = "mips64";
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -306,6 +306,18 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
+
+
+
+@@ -324,7 +336,7 @@
+
+
+
+-
++
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch b/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
deleted file mode 100644
index 1b43c67213..0000000000
--- a/dev-java/gluegen/files/gluegen-2.3.2-remove-static-lib.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- a/make/gluegen-cpptasks-base.xml
-+++ b/make/gluegen-cpptasks-base.xml
-@@ -1216,21 +1216,12 @@
-
-
-
--
--
--
--
--
-
-
--
--
-
-
-
-
--
--
-
-
-
-
-
-@@ -1324,8 +1305,6 @@
-
-
-
--
--
-
-
-
-@@ -1334,16 +1313,12 @@
-
-
-
--
--
-
-
-
-
-
-
--
--
-
-
-
-@@ -1351,8 +1326,6 @@
-
-
-
--
--
-
-
-
-@@ -1360,8 +1333,6 @@
-
-
-
--
--
-
-
-
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff b/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff
new file mode 100644
index 0000000000..5820c77652
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-rtjar.diff
@@ -0,0 +1,67 @@
+Description: No longer use rt.jar which is gone since Java 9
+Author: Emmanuel Bourg
+Forwarded: no
+--- a/make/build.xml
++++ b/make/build.xml
+@@ -729,7 +729,6 @@
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+- bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+
+
+@@ -757,7 +756,6 @@
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+- bootclasspath="${host.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+
+
+@@ -914,7 +912,6 @@
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+- bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+
+
+@@ -974,7 +971,6 @@
+ encoding="UTF-8"
+ source="${target.sourcelevel}"
+ target="${target.targetlevel}"
+- bootclasspath="${target.rt.jar}"
+ debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+
+
+--- a/make/jogamp-env.xml
++++ b/make/jogamp-env.xml
+@@ -183,13 +183,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -206,13 +199,6 @@
+
+
+
+-
+-
+-
+-
+-
+-
+-
+
+
+
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff b/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff
new file mode 100644
index 0000000000..e5576b3365
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-s390x-support.diff
@@ -0,0 +1,138 @@
+Description: add support for s390x arch.
+Author: Gilles Filippini
+--- /dev/null
++++ b/make/scripts/make.gluegen.all.linux-s390x.sh
+@@ -0,0 +1,24 @@
++#! /bin/sh
++
++# -Dc.compiler.debug=true \
++# -Dgluegen.cpptasks.detected.os=true \
++# -DisUnix=true \
++# -DisLinux=true \
++# -DisLinuxX86=true \
++# -DisX11=true \
++
++MACHINE=s390x
++ARCH=s390x
++TRIPLET=s390x-linux-gnu
++
++export TARGET_PLATFORM_LIBS=/usr/lib/$TRIPLET
++export TARGET_JAVA_LIBS=/usr/lib/jvm/java-7-openjdk-$ARCH/jre/lib/$MACHINE
++
++export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-$MACHINE.xml"
++
++#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
++export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
++
++ant \
++ -Drootrel.build=build-linux-$MACHINE \
++ $* 2>&1 | tee make.gluegen.all.linux-$MACHINE.log
+--- a/src/java/jogamp/common/os/PlatformPropsImpl.java
++++ b/src/java/jogamp/common/os/PlatformPropsImpl.java
+@@ -527,6 +527,7 @@ public abstract class PlatformPropsImpl
+ * linux-ia64
+ * linux-sparcv9
+ * linux-risc2.0
++ * linux-s390x
+ * freebsd-i586
+ * freebsd-amd64
+ * hpux-hppa
+@@ -593,6 +594,9 @@ public abstract class PlatformPropsImpl
+ case PA_RISC2_0:
+ _and_arch_tmp = "risc2.0";
+ break;
++ case S390X:
++ _and_arch_tmp = "s390x";
++ break;
+ default:
+ throw new InternalError("Unhandled CPUType: "+cpuType);
+ }
+--- a/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
++++ b/src/java/jogamp/common/os/elf/ElfHeaderPart1.java
+@@ -412,6 +412,15 @@ public class ElfHeaderPart1 {
+ cpuName = "ppc64";
+ abiType = ABIType.GENERIC_ABI;
+ break;
++ case EM_S390:
++ // Can be 32 or 64 bits
++ if( 64 == getArchClassBits() ) {
++ cpuName = "s390x";
++ } else {
++ cpuName = "s390";
++ }
++ abiType = ABIType.GENERIC_ABI;
++ break;
+ case EM_SH:
+ cpuName = "superh";
+ abiType = ABIType.GENERIC_ABI;
+--- a/src/java/com/jogamp/common/os/Platform.java
++++ b/src/java/com/jogamp/common/os/Platform.java
+@@ -77,7 +77,9 @@ public class Platform extends PlatformPr
+ /** Itanium */
+ IA64,
+ /** Hitachi SuperH */
+- SuperH;
++ SuperH,
++ /** IBM ESA/390 and zSystems */
++ S390;
+ }
+
+ public enum CPUType {
+@@ -118,9 +120,13 @@ public class Platform extends PlatformPr
+ /** SPARC 64bit, big endian */
+ SPARCV9_64(CPUFamily.SPARC, false),
+ /** PA_RISC2_0 64bit, ??? endian */
+- PA_RISC2_0(CPUFamily.PA_RISC, false);
++ PA_RISC2_0(CPUFamily.PA_RISC, false),
+ // 17
+
++ /** S390X 64bit big endian */
++ S390X(CPUFamily.S390, true);
++ // 18
++
+ public final CPUFamily family;
+ public final boolean is32Bit;
+
+@@ -201,6 +207,8 @@ public class Platform extends PlatformPr
+ return MIPS_32;
+ } else if( cpuABILower.startsWith("superh") ) {
+ return SuperH;
++ } else if( cpuABILower.equals("s390x") ) {
++ return S390X;
+ } else {
+ throw new RuntimeException("Please port CPUType detection to your platform (CPU_ABI string '" + cpuABILower + "')");
+ }
+--- a/src/java/com/jogamp/common/os/MachineDataInfo.java
++++ b/src/java/com/jogamp/common/os/MachineDataInfo.java
+@@ -73,6 +73,7 @@ public class MachineDataInfo {
+ private final static int[] align_sparc_32_sunos = { 1, 2, 4, 8, 4, 4, 4, 8, 8, 4 };
+ private final static int[] align_x86_32_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 4, 4 };
+ private final static int[] align_lp64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 16, 8 };
++ private final static int[] align_s390_64_unix = { 1, 2, 4, 8, 4, 8, 4, 8, 8, 8 };
+ private final static int[] align_x86_64_windows = { 1, 2, 4, 8, 4, 4, 4, 8, 16, 8 };
+
+ /**
+@@ -108,9 +109,11 @@ public class MachineDataInfo {
+ X86_32_WINDOWS( size_x86_32_windows, align_x86_32_windows),
+ /** LP64 Unix, e.g.: {@link Platform.CPUType#X86_64} Unix, {@link Platform.CPUType#ARM64} EABI, {@link Platform.CPUType#PPC64} Unix, .. */
+ LP64_UNIX( size_lp64_unix, align_lp64_unix),
++ /** {@link Platform.CPUType#S390X} Unix */
++ S390_64_UNIX( size_lp64_unix, align_s390_64_unix),
+ /** {@link Platform.CPUType#X86_64} Windows */
+ X86_64_WINDOWS( size_x86_64_windows, align_x86_64_windows);
+- // 8
++ // 9
+
+ public final MachineDataInfo md;
+
+--- a/src/java/jogamp/common/os/MachineDataInfoRuntime.java
++++ b/src/java/jogamp/common/os/MachineDataInfoRuntime.java
+@@ -112,6 +112,8 @@ public class MachineDataInfoRuntime {
+ } else {
+ if( osType == Platform.OSType.WINDOWS ) {
+ return StaticConfig.X86_64_WINDOWS;
++ } else if ( Platform.CPUType.S390X == cpuType ) {
++ return StaticConfig.S390_64_UNIX;
+ } else {
+ // for all 64bit unix types (x86_64, aarch64, sparcv9, ..)
+ return StaticConfig.LP64_UNIX;
diff --git a/dev-java/gluegen/files/gluegen-2.3.2-tests.diff b/dev-java/gluegen/files/gluegen-2.3.2-tests.diff
new file mode 100644
index 0000000000..be298505aa
--- /dev/null
+++ b/dev-java/gluegen/files/gluegen-2.3.2-tests.diff
@@ -0,0 +1,171 @@
+Description: enable testcases build and run.
+ One testcase can't build because of missing up to date semver-java:
+ - TestVersionSemantics
+ Three testcases fail on every arch while the library seems functional:
+ - TestUri99LaunchOnReservedCharPathBug908
+ - TestStructGen01
+ - TestStructGen02.
+Author: Gilles Filippini
+--- gluegen2.orig/make/build-test.xml
++++ gluegen2/make/build-test.xml
+@@ -84,6 +84,7 @@
+
+
+
++
+
+
+
+--- gluegen2.orig/make/scripts/runtest.sh
++++ gluegen2/make/scripts/runtest.sh
+@@ -42,7 +42,7 @@ rm -f $LOG
+ GLUEGEN_ROOT=`dirname $builddir`
+ ROOTREL_BUILD=`basename $builddir`
+
+-X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT"
++X_ARGS="-Drootrel.build=$ROOTREL_BUILD -Dgluegen.root=$GLUEGEN_ROOT -Djava.library.path=$builddir/obj:$builddir/test/build/natives"
+ #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup"
+ #D_ARGS="-Djogamp.debug.TraceLock"
+ #D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary"
+@@ -64,12 +64,12 @@ X_ARGS="-Drootrel.build=$ROOTREL_BUILD -
+ #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.IOUtil.Exe"
+ #D_ARGS="-Djogamp.debug.ByteBufferInputStream"
+ #D_ARGS="-Djogamp.debug.Bitstream"
+-#D_ARGS="-Djogamp.debug=all"
++D_ARGS="-Djogamp.debug=all"
+ #D_ARGS="-Djogamp.debug.Logging"
+
+ function onetest() {
+ #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
+- USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
++ USE_CLASSPATH=/usr/share/java/junit4.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../test/TestJarsInJar/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar:"$builddir"/gluegen-rt-natives.jar
+ #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt-alt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
+ libspath="$builddir"/test/build/natives
+ #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/classes:"$builddir"/test/build/classes
+@@ -88,66 +88,68 @@ function onetest() {
+ echo
+ }
+ #
++(cd $builddir/../test/TestJarsInJar && sh make.sh)
++#
+-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
++onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
+ #onetest com.jogamp.common.util.TestVersionSemantics 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.locks.TestSingletonServerSocket00 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.locks.TestSingletonServerSocket01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.locks.TestSingletonServerSocket02 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestFloatStack01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestIntegerStack01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestArrayHashMap01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG
+ onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
+-#onetest com.jogamp.common.util.TestLFRingBuffer01 $*
+-#onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
+-#onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestSyncRingBuffer01 $*
++onetest com.jogamp.common.util.TestLFRingBuffer01 $*
++onetest com.jogamp.common.util.TestBitfield00 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestBitstream00 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestBitstream01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestBitstream02 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestBitstream03 2>&1 | tee -a $LOG
++onetest com.jogamp.common.util.TestBitstream04 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.TestUrisWithAssetHandler 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.TestUriQueryProps 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.TestUri01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.TestUri02Composing 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.TestUri03Resolving 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.TestUri99LaunchOnReservedCharPathBug908 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
++onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
++onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.BuffersTest 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.TestByteBufferInputStream 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.TestByteBufferOutputStream 2>&1 | tee -a $LOG
++onetest com.jogamp.common.nio.TestByteBufferCopyStream 2>&1 | tee -a $LOG
++onetest com.jogamp.common.os.TestElfReader01 $* 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.internals.TestType 2>&1 | tee -a $LOG
+
+-#onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.generation.PCPPTest 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.jcpp.IncludeAbsoluteTest 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.jcpp.CppReaderTest 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.jcpp.TokenPastingWhitespaceTest 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.jcpp.PreprocessorTest 2>&1 | tee -a $LOG
+
+-#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
+-#onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.generation.Test1p2LoadJNIAndImplLib 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen01 2>&1 | tee -a $LOG
++onetest com.jogamp.gluegen.test.junit.structgen.TestStructGen02 2>&1 | tee -a $LOG
+
diff --git a/dev-java/gluegen/gluegen-2.3.2.ebuild b/dev-java/gluegen/gluegen-2.3.2.ebuild
index a1946b5764..d8cfd08265 100644
--- a/dev-java/gluegen/gluegen-2.3.2.ebuild
+++ b/dev-java/gluegen/gluegen-2.3.2.ebuild
@@ -4,6 +4,7 @@
EAPI=8
JAVA_PKG_IUSE="doc source test"
+WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
inherit java-pkg-2 java-ant-2 toolchain-funcs
@@ -40,26 +41,42 @@ DEPEND="
dev-java/ant-junit4
)
"
-BDEPEND="dev-vcs/git"
PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-ppc64el-support.diff"
+ "${FILESDIR}/${PN}-2.3.2-disableArchive7z.diff"
+ "${FILESDIR}/${PN}-2.3.2-disable-test-zip-archive.diff"
+ "${FILESDIR}/${PN}-2.3.2-disable_git_call.diff"
+ "${FILESDIR}/${PN}-2.3.2-linker.diff"
+ "${FILESDIR}/${PN}-2.3.2-hideException.diff"
+ "${FILESDIR}/${PN}-2.3.2-armhf.diff"
+ "${FILESDIR}/${PN}-2.3.2-fix-alpha-build-config.patch"
+ "${FILESDIR}/${PN}-2.3.2-missing-arch-symbol.diff"
+ "${FILESDIR}/${PN}-2.3.2-fix-arm64-build-config.diff"
+ "${FILESDIR}/${PN}-2.3.2-tests.diff"
+ "${FILESDIR}/${PN}-2.3.2-disable-static-linking.diff"
+ "${FILESDIR}/${PN}-2.3.2-s390x-support.diff"
+ "${FILESDIR}/${PN}-2.3.2-non-linux-support.diff"
+ "${FILESDIR}/${PN}-2.3.2-disable-java-version-check.diff"
+ "${FILESDIR}/${PN}-2.3.2-rtjar.diff"
+ "${FILESDIR}/${PN}-2.3.2-add-mips64el-mipsn32-support.diff"
+ "${FILESDIR}/${PN}-2.3.2-java10-compatibility.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix_gcc-10.patch"
+
"${FILESDIR}/${PN}-2.2.4-dont-copy-jars.patch"
"${FILESDIR}/${PN}-2.2.4-dont-strip.patch"
- "${FILESDIR}/${PN}-2.2.4-dont-test-archive.patch"
- "${FILESDIR}/${P}-remove-static-lib.patch"
- "${FILESDIR}/${P}-respect-flags.patch"
+ "${FILESDIR}/${PN}-2.3.2-respect-flags.patch"
)
EANT_BUILD_TARGET="all.no_junit"
EANT_BUILD_XML="make/build.xml"
EANT_DOC_TARGET=""
-EANT_EXTRA_ARGS="-Dc.strip.libraries=false"
+EANT_EXTRA_ARGS="-Dc.strip.libraries=false -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar= "
EANT_GENTOO_CLASSPATH="antlr,ant-core,jsr305"
EANT_GENTOO_CLASSPATH_EXTRA="${S}/build/${PN}{,-rt}.jar"
EANT_NEEDS_TOOLS="yes"
EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
EANT_TEST_TARGET="junit.run"
JAVA_ANT_REWRITE_CLASSPATH="yes"
-WANT_ANT_TASKS="ant-antlr ant-contrib dev-java/cpptasks:0"
src_prepare() {
tc-export CC
@@ -67,13 +84,6 @@ src_prepare() {
rm -rf make/lib || die
default
java-ant_bsfix_files "${S}/make/build-test.xml" "${S}/make/jogamp-env.xml"
-
- #it want a git repo
- git init || die
- git config --global user.email "you@example.com" || die
- git config --global user.name "Your Name" || die
- git add . || die
- git commit -m 'init' || die
}
src_test() {
diff --git a/dev-nim/nimbus/Manifest b/dev-nim/nimbus/Manifest
index e074800289..20387e18b1 100644
--- a/dev-nim/nimbus/Manifest
+++ b/dev-nim/nimbus/Manifest
@@ -1,2 +1,2 @@
-DIST nimbus-0.1.4.tar.gz 24797 BLAKE2B 79efed84fc0e592e3c8275cfc468a041ae460413772a754ea86e97fbb471b2aa49ae1f11d6aa2085853a12381ac9d4b04bff1c8ac9022c2d9e9145e4d2144743 SHA512 6b946d8354f6719eb3ae65aad316cee74f4ddeb275e3de704907f70c7e01df41fa50016b4f444688d72047dd7137e10bb22c5d7fa25f867ecb4300da992e8035
DIST nimbus-0.2.3.tar.gz 25325 BLAKE2B ede807e0d115f2de05956f739939a939c3492410ee5f62b40bbb88f1b7aebb3f5b3ed44d44ee3d1c4ed585f5d51388015a64609c97aa315b30b9cbf62f9b2e58 SHA512 2296de44960570fb371a7a90a50207c2c6cc0ba54e29e324bbe4f8a43b59c356b897e033dafab1eced9d7e76833e351aeb86252ed236a5d15c03a3f8639347c7
+DIST nimbus-0.2.4.tar.gz 25808 BLAKE2B 6f51934b41266dd9cf8a1027d76fd37fb717bbc057ab98d5858bcfd86cfde3f0cd9ffce98f1a73a68b063702a1b0e4c0fade5c6f7abd3118f2ceb2564f9187af SHA512 2228993dbb9b174f0b7ed353e34c19f96b970049da42dcc7a7112a63706234543ac19cdf177ce321db4d9093ae83ff98f31bdf5b4cb001a156c2c61c27f3cf1a
diff --git a/dev-nim/nimbus/nimbus-0.1.4.ebuild b/dev-nim/nimbus/nimbus-0.2.4.ebuild
similarity index 85%
rename from dev-nim/nimbus/nimbus-0.1.4.ebuild
rename to dev-nim/nimbus/nimbus-0.2.4.ebuild
index 4d9783b3a5..068ede93d7 100644
--- a/dev-nim/nimbus/nimbus-0.1.4.ebuild
+++ b/dev-nim/nimbus/nimbus-0.2.4.ebuild
@@ -16,10 +16,6 @@ KEYWORDS="~amd64"
RDEPEND="dev-lang/nim"
BDEPEND="${RDEPEND}"
-ETESTAMENT_DESELECT=(
- tests/installerscript/test_{binary,source,source_whitelist}.nim
-)
-
src_configure() {
nim_gen_config
}
diff --git a/dev-nim/packedjson/Manifest b/dev-nim/packedjson/Manifest
new file mode 100644
index 0000000000..17cd02b196
--- /dev/null
+++ b/dev-nim/packedjson/Manifest
@@ -0,0 +1 @@
+DIST packedjson-0.2.2.tar.gz 13748 BLAKE2B 44d8d7b4d9e8e10ea5ba1893185d8bcf0d05d735fb24d9d82618f23c9b6f03a4653ddab32e5059609cd619f358d73972504d7231bc6143d60dd84a875b382bbf SHA512 0e0493e55b8bf05624d0e995afad455e7fcf5018985f397feb9b1cf99830836e760fb91b68ec718c9488bb592ad59556d7f737a415fa75f248455858ed304123
diff --git a/dev-nim/packedjson/metadata.xml b/dev-nim/packedjson/metadata.xml
new file mode 100644
index 0000000000..b9448e53fd
--- /dev/null
+++ b/dev-nim/packedjson/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ Araq/packedjson
+
+
diff --git a/dev-nim/packedjson/packedjson-0.2.2.ebuild b/dev-nim/packedjson/packedjson-0.2.2.ebuild
new file mode 100644
index 0000000000..cb4494757b
--- /dev/null
+++ b/dev-nim/packedjson/packedjson-0.2.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="an alternative Nim implementation for JSON"
+HOMEPAGE="
+ https://github.com/Araq/packedjson
+ https://nimble.directory/pkg/packedjson
+"
+SRC_URI="https://github.com/Araq/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/Araq/packedjson"
+
+src_test() {
+ enim r ${PN}.nim | tee "${T}"/tests.out
+ grep -q "test failed" "${T}"/tests.out && die "tests failed"
+}
diff --git a/dev-nim/redpool/Manifest b/dev-nim/redpool/Manifest
new file mode 100644
index 0000000000..150232b2b7
--- /dev/null
+++ b/dev-nim/redpool/Manifest
@@ -0,0 +1 @@
+DIST redpool-0.1.0_p20220120.tar.gz 1571 BLAKE2B 47c01533030464ed52c999381d1e569dec909d000ce126586253b3f9cdc9a188bb92f512e476fc79e9d135ee805e085b9a4c132d98e30b786243e78a37e25104 SHA512 f11b45d986fdd8e05d4d03097aa4b7bf9a07c09692a315cdf4f89f3921470d85443c3c3f47184a24e356bbaa97bcc2ca680562f9118cef6aac149adfb2d22a0f
diff --git a/dev-nim/redpool/metadata.xml b/dev-nim/redpool/metadata.xml
new file mode 100644
index 0000000000..e59f0dec51
--- /dev/null
+++ b/dev-nim/redpool/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ zedeus/redpool
+ https://github.com/zedeus/redpool/issues
+ https://nimble.directory/docs/redpool
+
+ zedeus@pm.me
+ Zed
+
+
+
diff --git a/dev-nim/redpool/redpool-0.1.0_p20220120.ebuild b/dev-nim/redpool/redpool-0.1.0_p20220120.ebuild
new file mode 100644
index 0000000000..ba895ad8f2
--- /dev/null
+++ b/dev-nim/redpool/redpool-0.1.0_p20220120.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+COMMIT="8b7c1db069797300425037c98b825c5d3316f752"
+DESCRIPTION="Simple Redis connection pool"
+HOMEPAGE="
+ https://github.com/zedeus/redpool
+ https://nimble.directory/pkg/redpool
+"
+SRC_URI="https://github.com/zedeus/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-nim/zedeus_redis"
+
+set_package_url "https://github.com/zedeus/redpool"
diff --git a/dev-nim/sass/Manifest b/dev-nim/sass/Manifest
new file mode 100644
index 0000000000..57f8bdd54a
--- /dev/null
+++ b/dev-nim/sass/Manifest
@@ -0,0 +1 @@
+DIST sass-0.2.0.tar.gz 4768 BLAKE2B 6dd6d625caa96ed85b513950eb4f28598eb00d37ea7817bf6dcb2d84a2a06c118955ea1ebb07da759a9b28e02d4c0105e612a0832132511bea2a92491c1338d2 SHA512 9f9a57c07403adcf49845e5d1a6812a9889d9823c6b49a89b0cae863cca2810547703680934511ead14e2f1b995418702fb026fa9cc4199d8b764746f30d057a
diff --git a/dev-nim/sass/metadata.xml b/dev-nim/sass/metadata.xml
new file mode 100644
index 0000000000..b009324e67
--- /dev/null
+++ b/dev-nim/sass/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ dom96/sass
+
+
diff --git a/dev-nim/sass/sass-0.2.0.ebuild b/dev-nim/sass/sass-0.2.0.ebuild
new file mode 100644
index 0000000000..4662d38b51
--- /dev/null
+++ b/dev-nim/sass/sass-0.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="A wrapper for the libsass library"
+HOMEPAGE="
+ https://github.com/dom96/sass
+ https://nimble.directory/pkg/sass
+"
+SRC_URI="https://github.com/dom96/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-libs/libsass"
+RDEPEND="${DEPEND}"
+
+set_package_url "https://github.com/dom96/sass"
diff --git a/dev-nim/supersnappy/Manifest b/dev-nim/supersnappy/Manifest
new file mode 100644
index 0000000000..1e8e0dd052
--- /dev/null
+++ b/dev-nim/supersnappy/Manifest
@@ -0,0 +1 @@
+DIST supersnappy-2.1.3.tar.gz 9618144 BLAKE2B 953087a338a3a6a762e2a1897152d2045088b37346713f819b6606c34bfb1a288ff6d1f1cc3a347465fba8f07c30aa7ea1d790337d61ef542fbb42cd72ea4964 SHA512 96a1e0ad0882e04f407663072794ae6c4623a69a283a741d07ce015cf04083f83628ac7773f0b2891494f72e65a292f3ebea237034139d7b856aaa27ecf05cd9
diff --git a/dev-nim/supersnappy/metadata.xml b/dev-nim/supersnappy/metadata.xml
new file mode 100644
index 0000000000..ed76a15d0b
--- /dev/null
+++ b/dev-nim/supersnappy/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ guzba/supersnappy
+
+
diff --git a/dev-nim/supersnappy/supersnappy-2.1.3.ebuild b/dev-nim/supersnappy/supersnappy-2.1.3.ebuild
new file mode 100644
index 0000000000..28cbae7519
--- /dev/null
+++ b/dev-nim/supersnappy/supersnappy-2.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Nim implementation of Google's Snappy compression"
+HOMEPAGE="
+ https://github.com/guzba/supersnappy
+ https://nimble.directory/pkg/supersnappy
+"
+SRC_URI="https://github.com/guzba/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/guzba/supersnappy"
diff --git a/dev-nim/zedeus_redis/Manifest b/dev-nim/zedeus_redis/Manifest
new file mode 100644
index 0000000000..7aaffdfa0f
--- /dev/null
+++ b/dev-nim/zedeus_redis/Manifest
@@ -0,0 +1 @@
+DIST zedeus_redis-0.3.0_p20211226.tar.gz 14502 BLAKE2B ac88fe57e87bc9718914d8fa1364bd9c7ad52af7f192507fe1ebdb9b37aabdee047a96bc3eaa4763327ed0d65f6b83fa3e182b9717161611ccabd7f85d9dd7de SHA512 b4e0fdbdc9ae5a8cc17cca16db6b18a9832b079f772cb99f80e1147d0c7c65b6c4d6701cefbb6ce765c600035564f6b4d00ddfdfcb65592b9f4628e97d6b6873
diff --git a/dev-nim/zedeus_redis/metadata.xml b/dev-nim/zedeus_redis/metadata.xml
new file mode 100644
index 0000000000..0b10453c3e
--- /dev/null
+++ b/dev-nim/zedeus_redis/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ zedeus/redis
+
+
diff --git a/dev-nim/zedeus_redis/zedeus_redis-0.3.0_p20211226.ebuild b/dev-nim/zedeus_redis/zedeus_redis-0.3.0_p20211226.ebuild
new file mode 100644
index 0000000000..8b48aaa360
--- /dev/null
+++ b/dev-nim/zedeus_redis/zedeus_redis-0.3.0_p20211226.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+MY_PN="redis"
+COMMIT="d0a0e6fb3010015f0cc483ca2e540ace02446570"
+DESCRIPTION="Fork of the official redis client for Nim"
+HOMEPAGE="https://github.com/zedeus/redis"
+SRC_URI="https://github.com/zedeus/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-db/redis )"
+
+set_package_url "https://github.com/zedeus/redis"
+
+src_prepare() {
+ default
+ mv redis.nimble ${PN}.nimble || die
+}
+
+src_test() {
+ # Tests that don't require redis, currently broken
+ #enim r tests/tawaitorder.nim
+
+ # Tests that require redis
+ local redis_pid="${T}"/redis.pid
+ local redis_port=6379
+
+ ebegin "Spawning Redis (NOTE: port ${redis_port} must be free)"
+ "${EPREFIX}"/usr/sbin/redis-server - <<- EOF > /dev/null
+ daemonize yes
+ pidfile ${redis_pid}
+ port ${redis_port}
+ bind 127.0.0.1
+ EOF
+ eend ${?}
+
+ nimble_src_test
+
+ ebegin "Stopping Redis"
+ kill "$(<"${redis_pid}")"
+ eend ${?}
+}
diff --git a/dev-nim/zippy/Manifest b/dev-nim/zippy/Manifest
new file mode 100644
index 0000000000..24e6ecf125
--- /dev/null
+++ b/dev-nim/zippy/Manifest
@@ -0,0 +1 @@
+DIST zippy-0.10.3.tar.gz 53991961 BLAKE2B d22b6f5caf3b551ff19930e801b7234ca1b24336dc07e3f62811c4e3c0dff73f357f931e4ba3483ffed2109132e40b1a7360899ffa230812e8a035645ce4dff2 SHA512 bad6c0aa44f48072c88708954bc406fe28dcda82b72e1df2842465b989b6824d0acd0b33d752cc6d2c6985ddd315851af1907dbb3527a5170943705e2e9a4ded
diff --git a/dev-nim/zippy/metadata.xml b/dev-nim/zippy/metadata.xml
new file mode 100644
index 0000000000..36fd75cd89
--- /dev/null
+++ b/dev-nim/zippy/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ cyber+gentoo@sysrq.in
+ Anna
+
+
+ guzba/zippy
+
+
diff --git a/dev-nim/zippy/zippy-0.10.3.ebuild b/dev-nim/zippy/zippy-0.10.3.ebuild
new file mode 100644
index 0000000000..8c7806aaa4
--- /dev/null
+++ b/dev-nim/zippy/zippy-0.10.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Pure Nim implementation of deflate, zlib, gzip and zip"
+HOMEPAGE="
+ https://github.com/guzba/zippy
+ https://nimble.directory/pkg/zippy
+"
+SRC_URI="https://github.com/guzba/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/guzba/zippy"
diff --git a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
index 8ef2982d5f..6728860de4 100644
--- a/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
+++ b/dev-python/betamax-serializers/betamax-serializers-0.2.1.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1 optfeature
DESCRIPTION="A set of third-party serializers for Betamax"
diff --git a/dev-python/compreffor/compreffor-0.5.2.ebuild b/dev-python/compreffor/compreffor-0.5.2.ebuild
index 3c6e720fc8..25a63031c0 100644
--- a/dev-python/compreffor/compreffor-0.5.2.ebuild
+++ b/dev-python/compreffor/compreffor-0.5.2.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1
MY_P="${PN}-${PV/_p/.post}"
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
index bb04a6a993..8fda2775ec 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.8.2-r1.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/pytest-timeout[${PYTHON_USEDEP}]
dev-python/requests-mock[${PYTHON_USEDEP}]
- >=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
index 80ad56422e..8938ba9c7f 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
dev-python/requests[${PYTHON_USEDEP}]
dev-python/pytest-timeout[${PYTHON_USEDEP}]
dev-python/requests-mock[${PYTHON_USEDEP}]
- >=dev-python/trivup-0.8.3[${PYTHON_USEDEP}]
dev-python/protobuf-python[${PYTHON_USEDEP}]
dev-python/jsonschema[${PYTHON_USEDEP}]
diff --git a/dev-python/iuliia/iuliia-0.11.5.ebuild b/dev-python/iuliia/iuliia-0.11.5.ebuild
index aacf5740fc..f70e14518a 100644
--- a/dev-python/iuliia/iuliia-0.11.5.ebuild
+++ b/dev-python/iuliia/iuliia-0.11.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
DISTUTILS_USE_PEP517="flit"
inherit distutils-r1
diff --git a/dev-python/preggy/Manifest b/dev-python/preggy/Manifest
deleted file mode 100644
index b11b7e1cf6..0000000000
--- a/dev-python/preggy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST preggy-1.4.4.tar.gz 23351 BLAKE2B ed656f848349c0cdb0f44151ded15db1b68b7358a4633417a6889b4be9397dc0de96dbd5f43bb26f748d9cd4f16532f1954f3978690afa9e792ce24fbe942b20 SHA512 6eb6073eb28ba8684f2795c1d9aa93c2a24e50063359a769f7f7d84da2928e25a0ca86d4ac268dce0c2462bbe1a73e76f496325b6175a1218025e15fb7ce4f4c
diff --git a/dev-python/preggy/metadata.xml b/dev-python/preggy/metadata.xml
deleted file mode 100644
index 197e61eb39..0000000000
--- a/dev-python/preggy/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
- heynemann/preggy
- preggy
-
-
diff --git a/dev-python/preggy/preggy-1.4.4.ebuild b/dev-python/preggy/preggy-1.4.4.ebuild
deleted file mode 100644
index 4eac7d1e01..0000000000
--- a/dev-python/preggy/preggy-1.4.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="preggy is an assertion library for Python. What were you expecting?"
-HOMEPAGE="
- https://github.com/heynemann/preggy
- https://pypi.org/project/preggy/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/unidecode[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- dev-python/yanc[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests nose
diff --git a/dev-python/pyVows/Manifest b/dev-python/pyVows/Manifest
deleted file mode 100644
index 360102189a..0000000000
--- a/dev-python/pyVows/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pyVows-3.0.0-5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7.tar.gz 41052 BLAKE2B 98a373d4a98cf5416d173fd9c1889a82480a476ad7ccce0895a9a626068f7a3831ce131433ab9f38726c41cd92cb47426bd8ef1d5a4fb9aab7efd9ee7c06face SHA512 bfef76cce283a77cfb1fd4f3e4d9e73da648390f42ce79524151be44693d9c13864aa75411394a2e294eea93820118f08a160a291146fab4f7d23ef5e14de071
diff --git a/dev-python/pyVows/metadata.xml b/dev-python/pyVows/metadata.xml
deleted file mode 100644
index c209f74674..0000000000
--- a/dev-python/pyVows/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
- heynemann/pyvows
- pyVows
-
-
diff --git a/dev-python/pyVows/pyVows-3.0.0.ebuild b/dev-python/pyVows/pyVows-3.0.0.ebuild
deleted file mode 100644
index 61f1629818..0000000000
--- a/dev-python/pyVows/pyVows-3.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="5b0e2a202603c1fc00d1fa0c6134c92c15b7e2b7"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Parallel running of tests, code coverage reports, test profiling, and more"
-HOMEPAGE="
- https://github.com/heynemann/pyvows
- https://pypi.org/project/pyVows/
-"
-SRC_URI="https://github.com/heynemann/${PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz" # only for 3.0.0
-S="${WORKDIR}/${PN,,}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- >=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
- >=dev-python/preggy-1.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
index 85b9ab34e8..04f41205e4 100644
--- a/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
+++ b/dev-python/pygaljs/pygaljs-1.0.2-r1.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Python package providing assets from https://github.com/Kozea/pygal.js"
diff --git a/dev-python/pymp4/Manifest b/dev-python/pymp4/Manifest
deleted file mode 100644
index 883fdc25e9..0000000000
--- a/dev-python/pymp4/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pymp4-1.2.0.tar.gz 13969 BLAKE2B ccbf3664a410162662117307add90bc7c8ab060e633c8acf0cf96607d0ad193618af28eba48a467f380af1e39a4ce3596f0da2a341c94e764c8ef9582dd47cb6 SHA512 307b0d454f56eb185abea1213640e888880c505388e3869cc92be462b2d37dd9244e4b23984c535f84791ed067873e1454e7d89b8109763d44b6d3188658aff4
diff --git a/dev-python/pymp4/metadata.xml b/dev-python/pymp4/metadata.xml
deleted file mode 100644
index 590cf7c712..0000000000
--- a/dev-python/pymp4/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
- https://github.com/beardypig/pymp4/issues
- beardypig/pymp4
- pymp4
-
-
diff --git a/dev-python/pymp4/pymp4-1.2.0.ebuild b/dev-python/pymp4/pymp4-1.2.0.ebuild
deleted file mode 100644
index f0497cb682..0000000000
--- a/dev-python/pymp4/pymp4-1.2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python MP4 Parser and toolkit"
-HOMEPAGE="
- https://github.com/beardypig/pymp4
- https://pypi.org/project/pymp4/
-"
-SRC_URI="https://github.com/beardypig/pymp4/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="dev-python/construct[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
index 98597a6aec..de0afe2d7a 100644
--- a/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
+++ b/dev-python/pytest-harvest/pytest-harvest-1.10.4.ebuild
@@ -32,6 +32,11 @@ BDEPEND="
)
"
+EPYTEST_DESELECT=(
+ "pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results.py]"
+ "pytest_harvest/tests/test_all_raw_with_meta_check.py::test_run_all_tests[test_get_session_results_indirect_and_noparam.py]"
+)
+
distutils_enable_tests pytest
python_prepare_all() {
diff --git a/dev-python/python_jwt/Manifest b/dev-python/python_jwt/Manifest
deleted file mode 100644
index e621bf7602..0000000000
--- a/dev-python/python_jwt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST python_jwt-3d9747df616d209c07bffe2bcf28b42e92a7d8d4.tar.gz 239032 BLAKE2B 2221d0445898ff1fa7737369e6488cf87287b359751113df61f4677bc9a31d3c90790c77bbaa4df08789019bca93c432dca96245ff28fa931557c046bc705f83 SHA512 43896e20bb2104d43b800f86342035d9eea3a0c70175c47d7875fa9b926dbb7c0f2840a68f25bdae5689df1f80198f74a7738c6a5a19d30748d53c1ebac39cf5
diff --git a/dev-python/python_jwt/metadata.xml b/dev-python/python_jwt/metadata.xml
deleted file mode 100644
index 1fb50e1206..0000000000
--- a/dev-python/python_jwt/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
-Module for generating and verifying JSON Web Tokens.
-
- Note: From version 2.0.1 the namespace has changed from jwt to python_jwt, in order to avoid conflict with PyJWT.
- Note: Versions 1.0.0 and later fix a vulnerability in JSON Web Token verification so please upgrade if you're using this functionality. The API has changed so you will need to update your application. verify_jwt now requires you to specify which signature algorithms are allowed.
- Uses jwcrypto to do the heavy lifting.
- Supports RS256, RS384, RS512, PS256, PS384, PS512, HS256, HS384, HS512, ES256, ES384, ES512, ES256K, EdDSA and none signature algorithms.
- Unit tests, including tests for interoperability with jose.
- Supports Python 2,7 and 3.6+. Note: generate_jwt returns the token as a Unicode string, even on Python 2.7.
-
-
- davedoesdev/python-jwt
- python-jwt
-
-
diff --git a/dev-python/python_jwt/python_jwt-3.3.2.ebuild b/dev-python/python_jwt/python_jwt-3.3.2.ebuild
deleted file mode 100644
index 128e714760..0000000000
--- a/dev-python/python_jwt/python_jwt-3.3.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT="3d9747df616d209c07bffe2bcf28b42e92a7d8d4"
-MYPN="${PN/_/-}"
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for generating and verifying JSON Web Tokens"
-HOMEPAGE="
- https://github.com/davedoesdev/python-jwt
- https://pypi.org/project/python-jwt/
-"
-SRC_URI="https://github.com/davedoesdev/${MYPN}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
-S="${WORKDIR}/${MYPN}-${COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=dev-python/jwcrypto-1.0.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="
- test? (
- >=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
- >=dev-python/gevent-1.2.2[${PYTHON_USEDEP}]
- >=dev-python/pyVows-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
- )
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
- "${EPYTHON}" test/run/run_pyvows.py -v test || die
-}
diff --git a/dev-python/sortedcollections/Manifest b/dev-python/sortedcollections/Manifest
index ca3ac0622f..ae64c7f980 100644
--- a/dev-python/sortedcollections/Manifest
+++ b/dev-python/sortedcollections/Manifest
@@ -1 +1 @@
-DIST sortedcollections-2.1.0.tar.gz 48563 BLAKE2B 5de36155858dc055c9412ff410bd70b489aba292a2956216db95641e10dcb249b98e5c005c4d7c4fd00b25c3315c65b3f43f404737591632ac223a4045b775b5 SHA512 7cb95af1791ab8f8c99847c1b9e0b8c1e7cc7dfe8a9df5db8bb3c96ceb2f15d7351ab4ff081d037d34dbb6c3108f4b575ca22c9e9e911a727d31b9ba3bf975f6
+DIST sortedcollections-2.1.0.gh.tar.gz 48563 BLAKE2B 5de36155858dc055c9412ff410bd70b489aba292a2956216db95641e10dcb249b98e5c005c4d7c4fd00b25c3315c65b3f43f404737591632ac223a4045b775b5 SHA512 7cb95af1791ab8f8c99847c1b9e0b8c1e7cc7dfe8a9df5db8bb3c96ceb2f15d7351ab4ff081d037d34dbb6c3108f4b575ca22c9e9e911a727d31b9ba3bf975f6
diff --git a/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild b/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
index c7b9009909..6a91e424d2 100644
--- a/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-2.1.0.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Apache2 licensed Python sorted collections library"
@@ -11,8 +12,8 @@ HOMEPAGE="
https://pypi.org/project/sortedcollections/
https://github.com/grantjenks/python-sortedcollections
"
-SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-${PN}-${PV}"
+SRC_URI="https://github.com/grantjenks/python-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/python-${P}"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-python/sse-starlette/Manifest b/dev-python/sse-starlette/Manifest
index 6eb33aa2f6..5c307c5b6f 100644
--- a/dev-python/sse-starlette/Manifest
+++ b/dev-python/sse-starlette/Manifest
@@ -1 +1,2 @@
+DIST sse-starlette-0.10.3.tar.gz 513991 BLAKE2B 2d3531e1cb5142e3b6b3c843522b9c2b54a416af18a84c2bbcfdf7761b12405dd8660b53ca807cfdd6c3606d1cded762993922fcc84d15092191e6685dd346d5 SHA512 fe1643ac1624be4ef727108465396dfc5c1e298b8a99918dbad4f1e4f766e35a33f900a63fb31e0c45849a2fdc5e3b3fae9e749413f2431ec554db3db128357a
DIST sse-starlette-0.9.0.tar.gz 511176 BLAKE2B 0ff4cffb60c585af99d70c8fa710b342323b03e1fb9a52af63d5c43b41f49fa2ef71a78355d6677d8e89ab3ecc80ce75cc0a10a4cc48c728b82deec2acab027a SHA512 bca27f1bca8ac864af24dc03f3f49765d8249940583036830ccc805289a7b87f8dcf1c159af308c4e94b85641d8af50c6236be55eaa802bca9d02c7d5cead50d
diff --git a/dev-python/sse-starlette/sse-starlette-0.10.3.ebuild b/dev-python/sse-starlette/sse-starlette-0.10.3.ebuild
new file mode 100644
index 0000000000..d6efd73a24
--- /dev/null
+++ b/dev-python/sse-starlette/sse-starlette-0.10.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Server Sent Events for Starlette"
+HOMEPAGE="
+ https://pypi.org/project/sse-starlette/
+ https://github.com/sysid/sse-starlette
+"
+SRC_URI="https://github.com/sysid/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/starlette[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild b/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild
index c3cc98a1d5..8c1d2b9856 100644
--- a/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild
+++ b/dev-python/tempus-themes/tempus-themes-2.3.0.20220206.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
inherit distutils-r1
DESCRIPTION="Accessible themes for Pygments"
diff --git a/dev-python/trivup/Manifest b/dev-python/trivup/Manifest
deleted file mode 100644
index 7a8ed75c5f..0000000000
--- a/dev-python/trivup/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST trivup-0.10.0.gh.tar.gz 194500 BLAKE2B 46e9f50e1602f270aab5720d205a3d16882a5c7fcf342913083a9172b86f97346b8a7d33267d666734c476f2c7ef7d2618a3fa234fbf1cd559ae614766e1c425 SHA512 8598280e3a38dee85c46d52e688dc2e146bc5ffcede678326af661ac9fd09f7719d6b892a7d264b94d147e0b02f117eca8472898d479bdc4a64b521c2807262a
diff --git a/dev-python/trivup/metadata.xml b/dev-python/trivup/metadata.xml
deleted file mode 100644
index 8b0293d219..0000000000
--- a/dev-python/trivup/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
-trivup is a flexible, pluggable, light-weight, partly naiivistic, framework for trivially bringing up a cluster of applications.
-
-The initial use-case is to bring up a simple Kafka cluster for easily testing librdkafka on different broker versions.
-
-Featured apps:
-
- Apache Kafka cluster with optional KRaft (ZooKeeper-less) support
- Apache ZooKeeper
- Confluent's Schema-Registry
- Kerberos 5 KDC for GSSAPI/Kerberos authentication
- OAUTHBEARER OIDC JWK ticket server
- SSL CA/public/private certificate generation
-
-SECURITY WARNING: trivup will run unprotected, wide-open, poorly-configured, server applications on your machine, providing an ingress vector for intrusion, theft and data-loss. DO NOT RUN ON PUBLIC NETWORKS.
-
-
- edenhill/trivup
- trivup
-
-
diff --git a/dev-python/trivup/trivup-0.10.0.ebuild b/dev-python/trivup/trivup-0.10.0.ebuild
deleted file mode 100644
index 7458b7cb6b..0000000000
--- a/dev-python/trivup/trivup-0.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Trivially Up a cluster of applications"
-HOMEPAGE="
- https://github.com/edenhill/trivup
- https://pypi.org/project/trivup/
-"
-SRC_URI="https://github.com/edenhill/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/jwcrypto[${PYTHON_USEDEP}]
- dev-python/python_jwt[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test" # tests try to download and install kafka
-
-distutils_enable_tests pytest
diff --git a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
index a056165288..5bd221cca2 100644
--- a/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
+++ b/dev-python/ufoLib2/ufoLib2-0.13.1.ebuild
@@ -10,7 +10,7 @@ DOCS_DEPEND="
"
DOCS_DIR="${S}/docs/source"
DOCS_BUILDER="sphinx"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 docs
diff --git a/dev-python/xunitparser/xunitparser-1.3.4.ebuild b/dev-python/xunitparser/xunitparser-1.3.4.ebuild
index 798c05caef..9d5f39ccb1 100644
--- a/dev-python/xunitparser/xunitparser-1.3.4.ebuild
+++ b/dev-python/xunitparser/xunitparser-1.3.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 2012-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Read JUnit/XUnit XML files and map them to Python objects"
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
distutils_enable_tests unittest
diff --git a/dev-python/yanc/Manifest b/dev-python/yanc/Manifest
deleted file mode 100644
index 59ffcd3688..0000000000
--- a/dev-python/yanc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yanc-0.3.3.tar.gz 16600 BLAKE2B 3a84943f59f60a153b7e76825c047f4a20779125f83a5b20c253cd24909d99e6aeb67bc870fd36b9f853edd7c9770b9e0b687dc868464c5a569242ae0140552a SHA512 8c19f6490b44aaa3745b9c0048e0a8fdd7081691815bede0399b1a2a313fa62697bfba526bb1bcb41078f4d1375208c494c89879a3111a8749ef70928ea2bf4a
diff --git a/dev-python/yanc/metadata.xml b/dev-python/yanc/metadata.xml
deleted file mode 100644
index 35fa921406..0000000000
--- a/dev-python/yanc/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
- 0compute/yanc
- yanc
-
-
diff --git a/dev-python/yanc/yanc-0.3.3.ebuild b/dev-python/yanc/yanc-0.3.3.ebuild
deleted file mode 100644
index e02b618ee7..0000000000
--- a/dev-python/yanc/yanc-0.3.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another nose colorer"
-HOMEPAGE="
- https://github.com/0compute/yanc
- https://pypi.org/project/yanc/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-distutils_enable_tests nose
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild
index 0fc9a3e312..b55e91db8f 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-single-r1
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
index 0fc9a3e312..b55e91db8f 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit meson python-single-r1
diff --git a/dev-util/pmbootstrap/Manifest b/dev-util/pmbootstrap/Manifest
index b5d01ee277..9a3ecc4c98 100644
--- a/dev-util/pmbootstrap/Manifest
+++ b/dev-util/pmbootstrap/Manifest
@@ -1,2 +1 @@
-DIST pmbootstrap-1.43.1.tar.gz 225811 BLAKE2B d8e5d74510692f65e1430be9d813c23c95c4e8b44212c21ef01747264333a59cb158fb7f03866ca28d907b2d9ab927bfa9dd347bed7462fab6c64b03b9a629cf SHA512 96ba36dba211eacca44afae2c7009fc3e784e0067547406f9640eda311e3331adc54a81ebecefdf3238096e7a156dd3e56fc5b2864c28810c0526ab3efb64c15
-DIST pmbootstrap-1.44.1.tar.gz 225898 BLAKE2B 0dd8ea621c7ece8cd7f331d06dd85bde6b38c08bcadd8b0bc6d364855bef7204007988d79992b4ecc8d15e89f1f3917aa0104e81f93ab88e62392da6c96a0bcc SHA512 05499bea2d880f7c8ec3e4bf87b819186448eb99855989d88dc7fa320c71b142461e0679d6089cb06cd3f3b887da389e924d03b20e5f9c339b1ef7610b37b2cf
+DIST pmbootstrap-1.45.0.tar.gz 226591 BLAKE2B 163c10102fab1c700d493bad7a007ebb2feed83f99ee9faba8ef71f1aab9ebbe6a8f2ff19d181ba01a1b121d31e36f32b20dd6ce4b9d408ec5eddc9f90b998c7 SHA512 7e62bed9350a54ea875bed6c17c7070b87900589e0db89b865baa0a5d7d211a439f308cf5b544f896d58cb4439bb1ce424e9d42defeb8ec7b14308f62a0529bf
diff --git a/dev-util/pmbootstrap/pmbootstrap-1.43.1.ebuild b/dev-util/pmbootstrap/pmbootstrap-1.43.1.ebuild
deleted file mode 100644
index 13891d02f1..0000000000
--- a/dev-util/pmbootstrap/pmbootstrap-1.43.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-r1 distutils-r1 linux-info
-
-DESCRIPTION="Helper tool for developing and building postmarketOS"
-HOMEPAGE="https://postmarketos.org/"
-
-SRC_URI="https://files.pythonhosted.org/packages/6d/40/b345af67f4784083510735bfa821233daa61029dfb024aac5479d9be8ee6/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-
-# According to upstream README either x86, amd64 or arm64 are required. I
-# wrote down all other arches because if I just did -* without adding x86 and
-# arm64 keywords it would seem like the package only works on amd64, but I can't
-# keyword x86 and arm64 because I can't test these.
-KEYWORDS="-alpha ~amd64 -arm -hppa -ia64 -ppc -ppc64 -riscv -sparc"
-# Tests are disabled because they require the pmaports repository (containing
-# postmarketOS APKBUILDs) to be cloned at runtime.
-RESTRICT="mirror test"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- dev-vcs/git"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
- if kernel_is -lt 3 17 0; then
- eerror "pmbootstrap requires Linux 3.17 or greater."
- die
- fi
-}
diff --git a/dev-util/pmbootstrap/pmbootstrap-1.44.1.ebuild b/dev-util/pmbootstrap/pmbootstrap-1.45.0.ebuild
similarity index 100%
rename from dev-util/pmbootstrap/pmbootstrap-1.44.1.ebuild
rename to dev-util/pmbootstrap/pmbootstrap-1.45.0.ebuild
diff --git a/dev-util/reuse/reuse-1.0.0.ebuild b/dev-util/reuse/reuse-1.0.0.ebuild
index 91dfcab6eb..23d4b7a611 100644
--- a/dev-util/reuse/reuse-1.0.0.ebuild
+++ b/dev-util/reuse/reuse-1.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
DISTUTILS_USE_PEP517=poetry
inherit distutils-r1
diff --git a/dev-vcs/got/Manifest b/dev-vcs/got/Manifest
index 17d3b1e2ea..724f53d973 100644
--- a/dev-vcs/got/Manifest
+++ b/dev-vcs/got/Manifest
@@ -1,2 +1,2 @@
-DIST got-portable-0.70.tar.gz 726825 BLAKE2B 63bc71246635fbbc00abd050e2f0f137664fa69cf43def964bc0073732cf89a48182d3bde747f7ec6c77e93f6c5e9b7820d22ba2130f7d4b4857c1f36f20ed8e SHA512 3f4b83964cf26dae717af653213bd698900b604d901bbcc1b382d73a7e6e3601eab233729d0be738cb624a970d2805256fbece5d7669ffb8f7be40fe3eabf8a1
DIST got-portable-0.71.tar.gz 736740 BLAKE2B f9788490881ae2b32b72139358f8bdd965b6c6c80009385db969d0305b3b5649feb4469048f247fbab1a7dcca1dd557165977af2a302ab31641e19328d1d8e2b SHA512 c48932b981ac6cc784fcc6e64b7d4a492840db43c6f0aec355474400ad3df0ea34620c0d4cf543b3583abb6f3908b6381752a235306b34cf81b00749ae19ada4
+DIST got-portable-0.73.tar.gz 753204 BLAKE2B 577d4439002adf457a683509f77120f294bbfd75af38c8bee9aaefc9be7538c572956a3c00e7b1bff97f9908107e2f0edbf1d38dff9443dde24c7380d528ac25 SHA512 5cc4dde718910d5b44e238759673ede1b8f6630f801321ced0df0a4b8ff38afca1e77adb8c667f4c74f3e3c8949e460c089951380b54fd231e5b0c7aec03f36e
diff --git a/dev-vcs/got/got-0.70.ebuild b/dev-vcs/got/got-0.73.ebuild
similarity index 100%
rename from dev-vcs/got/got-0.70.ebuild
rename to dev-vcs/got/got-0.73.ebuild
diff --git a/eclass/nim-utils.eclass b/eclass/nim-utils.eclass
index 12b0774523..eb03c0fc56 100644
--- a/eclass/nim-utils.eclass
+++ b/eclass/nim-utils.eclass
@@ -73,9 +73,11 @@ etestament() {
if [[ ${ETESTAMENT_DESELECT} ]]; then
local skipfile="${T}"/testament.skipfile
- for t in "${ETESTAMENT_DESELECT[@]}"; do
- echo "${t}" >> "${skipfile}"
- done
+ if [[ ! -f ${skipfile} ]]; then
+ for t in "${ETESTAMENT_DESELECT[@]}"; do
+ echo "${t}" >> "${skipfile}"
+ done
+ fi
testament_args+=( --skipFrom:"${skipfile}" )
fi
diff --git a/eclass/nimble.eclass b/eclass/nimble.eclass
index 4c80bd2a9f..20e9f5a5ad 100644
--- a/eclass/nimble.eclass
+++ b/eclass/nimble.eclass
@@ -134,10 +134,12 @@ nimble_src_configure() {
local nimbusargs=(
--nimbleDir:"${EPREFIX}"/opt/nimble
--binDir:"${EPREFIX}"/usr/bin
- --url:"$(get_package_url)"
"${mynimargs[@]}"
)
+ [[ -n "$(get_package_url)" ]] && \
+ nimbusargs+=( --url:"$(get_package_url)" )
+
set -- nimbus "${nimbusargs[@]}" "${S}" "${BUILD_DIR}"
echo "${@}" >&2
"${@}" || die "${*} failed"
diff --git a/eclass/qbs.eclass b/eclass/qbs.eclass
index af5709e261..c2c892440b 100644
--- a/eclass/qbs.eclass
+++ b/eclass/qbs.eclass
@@ -19,13 +19,7 @@ esac
if [[ ! ${_QBS_ECLASS} ]]; then
-inherit multiprocessing toolchain-funcs qmake-utils
-
-fi
-
-EXPORT_FUNCTIONS src_configure src_compile src_install
-
-if [[ ! ${_QBS_ECLASS} ]]; then
+inherit flag-o-matic multiprocessing toolchain-funcs qmake-utils
# @ECLASS_VARIABLE: QBS_COMMAND_ECHO_MODE
# @USER_VARIABLE
@@ -42,7 +36,10 @@ if [[ ! ${_QBS_ECLASS} ]]; then
# - command-line-with-environment
: ${QBS_COMMAND_ECHO_MODE:=command-line}
-BDEPEND="dev-util/qbs"
+BDEPEND="
+ dev-util/meson-format-array
+ dev-util/qbs
+"
# @FUNCTION: eqbs
# @USAGE: [...]
@@ -64,31 +61,7 @@ eqbs() {
# @USAGE: [...]
# @RETURN: arguments quoted and separated by comma
_flags_to_js_array() {
- if [[ ! ${@} ]]; then
- echo "[]"
- else
- local -a array
- printf -v array "'%s', " "${@}"
- echo "[${array%, }]"
- fi
-}
-
-# @FUNCTION: _filter_ldflags
-# @INTERNAL
-# @USAGE: [...]
-# @RETURN: flags for the linker (with -Wl and -Xlinker removed)
-_filter_ldflags() {
- local -a flags
- while [[ ${@} ]]; do
- if [[ ${1} == -Wl,* ]]; then
- IFS=, read -ra flags <<< "${1#-Wl,}"
- printf "%s " "${flags[@]}"
- elif [[ ${1} == -Xlinker ]]; then
- shift
- printf "%s " "${1}"
- fi
- shift
- done
+ meson-format-array "${@}" || die
}
# @FUNCTION: qbs_src_configure
@@ -121,7 +94,7 @@ qbs_src_configure() {
qbs_config cpp.cFlags "$(_flags_to_js_array ${CFLAGS})"
qbs_config cpp.cppFlags "$(_flags_to_js_array ${CPPFLAGS})"
qbs_config cpp.cxxFlags "$(_flags_to_js_array ${CXXFLAGS})"
- qbs_config cpp.linkerFlags "$(_flags_to_js_array $(_filter_ldflags ${LDFLAGS}))"
+ qbs_config cpp.linkerFlags "$(_flags_to_js_array $(raw-ldflags))"
}
# @FUNCTION: qbs_config
@@ -188,3 +161,5 @@ qbs_src_install() {
_QBS_ECLASS=1
fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_install
diff --git a/games-fps/openspades/openspades-0.1.3.ebuild b/games-fps/openspades/openspades-0.1.3.ebuild
index 3505558648..0922688a8b 100644
--- a/games-fps/openspades/openspades-0.1.3.ebuild
+++ b/games-fps/openspades/openspades-0.1.3.ebuild
@@ -32,6 +32,7 @@ x11-themes/hicolor-icon-theme
DEPEND="${RDEPEND}"
BDEPEND="
virtual/pkgconfig
+app-arch/zip
app-arch/unzip
media-gfx/imagemagick[jpeg,png]
"
diff --git a/games-misc/gay/gay-1.2.8.ebuild b/games-misc/gay/gay-1.2.8.ebuild
index 13c3e5047d..daa36e777d 100644
--- a/games-misc/gay/gay-1.2.8.ebuild
+++ b/games-misc/gay/gay-1.2.8.ebuild
@@ -3,7 +3,8 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
inherit distutils-r1
DESCRIPTION="Colour your text / terminal to be more gay"
diff --git a/gui-libs/cubegui/Manifest b/gui-libs/cubegui/Manifest
index d48443b772..2ba0282afa 100644
--- a/gui-libs/cubegui/Manifest
+++ b/gui-libs/cubegui/Manifest
@@ -1 +1 @@
-DIST cubegui-4.7.tar.gz 10789553 BLAKE2B b0c00985ed910f57e5a32ef340007bbb547ee2948b9d64868227679c86481e953edca75c9cceac8eefb73f1392c5417d27bee809b430288d6a37f054074b0a6a SHA512 48c9cc5a32190d0702d79572f8ad49893016476cc966351b0496e21c5ae8c0a33f0632f07e659eea3c3c062eae8099a531f0a7ff4d129d8b333ec51ecfe12cf9
+DIST cubegui-4.7-9a161bfd.tar.gz 10696455 BLAKE2B 0f7a2c2af3dfbba3b0f505901f7b1efaea6b327bb7e88ee116a8774454f8b246ce01e732be28f2922b58320b2429b2988bed79e0af70e8b788ff7a638802d62c SHA512 ee22fdb7ffddcb9033e729a54ff3009baadc3774bb4434b890aac3527e62644af5a3ab89211a8d40eb6e754b7074b504e62bb711304d4388129a75962fae0743
diff --git a/gui-libs/cubegui/cubegui-4.7.ebuild b/gui-libs/cubegui/cubegui-4.7-r1.ebuild
similarity index 90%
rename from gui-libs/cubegui/cubegui-4.7.ebuild
rename to gui-libs/cubegui/cubegui-4.7-r1.ebuild
index 00067af6a7..5e8ec0bede 100644
--- a/gui-libs/cubegui/cubegui-4.7.ebuild
+++ b/gui-libs/cubegui/cubegui-4.7-r1.ebuild
@@ -5,9 +5,13 @@ EAPI=8
inherit bash-completion-r1 qmake-utils toolchain-funcs
+MYPV="9a161bfd"
+MYP="sources.${MYPV}"
+
DESCRIPTION="CUBE Uniform Behavioral Encoding GUI"
HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
-SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.gz"
+SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/${PN}/branches/master/${MYP}.tar.gz -> ${P}-${MYPV}.tar.gz"
+S="${WORKDIR}/${MYP}"
LICENSE="BSD"
SLOT="0"
@@ -31,9 +35,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="app-doc/doxygen[dot]"
-PATCHES=(
- "${FILESDIR}/${P}-custom-compiler.patch"
-)
+# reconfigure needs custom autotools
src_configure() {
tc-export CC CXX FC F77 CPP AR
@@ -74,10 +76,6 @@ src_configure() {
MPI_LDFLAGS=${LDFLAGS}
EOF
- export QT_LIBS="-lQt5PrintSupport -lQt5Widgets -lQt5Gui -lQt5Network -lQt5Core"
- use concurrent && export QT_LIBS="${QT_LIBS} -lQt5Concurrent"
- use webengine && export QT_LIBS="${QT_LIBS} -lQt5WebEngineWidgets"
-
local myconf=(
--disable-platform-mic
--with-cubelib="${EPREFIX}/usr"
diff --git a/kde-apps/alligator/Manifest b/kde-apps/alligator/Manifest
index 17a47ec1a6..c02afe159b 100644
--- a/kde-apps/alligator/Manifest
+++ b/kde-apps/alligator/Manifest
@@ -1,2 +1,2 @@
-DIST alligator-21.12.tar.xz 174940 BLAKE2B 71cc30edab53c4a2478b0cb7e65e4c1a808a5e9c31a5399bd6e7e5005d1cf1ed641bc813fb752e880f5e6bef45d98028f34093c6b272ea0a4a5b2b80607573af SHA512 8af4d2c522e9fc31fec38628252c3aa9fd23c1d2fbef3dfbd8afcd2d5c0ed6c1cef6ede145917c78586a972bc31f91b29a5279850e970dc221bbfc5e7a379a4a
DIST alligator-22.02.tar.xz 176452 BLAKE2B 2693d43956d69fce493387a17e989db64dfddf7ad75a4deaa9cb9add4451eacec2e1f354e4cbecef18467e5744db32b787b29f2faaeed13e9efa1e551fe25657 SHA512 983ba7f19ee00de612717253cd230e5783fcddbb9319e4dda5e3f84ef483f68b3f6c219e6f23a5db8839f769127eaeccca671b3a7a9ed344bdf9804a1d68d2e0
+DIST alligator-22.06.tar.xz 179844 BLAKE2B d78ed0968b7f11373bf240f14d3ed41f70433f6051ad82f262b31658280e96e3b2e2c8def17c794b9fa64ac5952dde7ac597a2af065f23ea0a94cad3255b29fc SHA512 4296af89558e7369772413eeddf61a66c476faa2585e9821fba1569bfdd6745043210aadbc23e5056f8f53c6045f64eb93dfa435be10579e92ba9910c828644f
diff --git a/kde-apps/alligator/alligator-21.12.ebuild b/kde-apps/alligator/alligator-22.06.ebuild
similarity index 92%
rename from kde-apps/alligator/alligator-21.12.ebuild
rename to kde-apps/alligator/alligator-22.06.ebuild
index acf80d990e..15741c8b54 100644
--- a/kde-apps/alligator/alligator-21.12.ebuild
+++ b/kde-apps/alligator/alligator-22.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,6 +24,7 @@ DEPEND="
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtsql-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
diff --git a/kde-apps/kclock/Manifest b/kde-apps/kclock/Manifest
index 17391ff82d..cff7fa9f59 100644
--- a/kde-apps/kclock/Manifest
+++ b/kde-apps/kclock/Manifest
@@ -1,2 +1,2 @@
-DIST kclock-21.12.tar.xz 625240 BLAKE2B ba64bcdd9acc61c792f9378f630b1902e36daa69724c39c66ffad0f44bb5716b0492333b07976c1de69ae911503c694a4288df54441c145ad9aa409a8153f553 SHA512 a8955129c12af2d66d89b94a7f58020e34db00c30ae1e4010392b436566a63ed471cb1bef159c2aa943c9cb352b440aa9fdd5e9aa9aef68f3a427e2d0d7f7921
DIST kclock-22.02.tar.xz 685432 BLAKE2B 61380685280318a5968fa8773ed97f91cf81f0a556060c62b9acc2b208e58b1bb545f86dffbebbe1429f5c83930ce6a583052e61e3d124186f012cecae1381be SHA512 4dcd158ed58e5c54b4e2c6b6c93b74b67d0fa31c40cfb454e29829970fc29392a9e246b7122c72f86a104fa1fcbdbec274f6ade47db9cde53bafb94ffb906944
+DIST kclock-22.06.tar.xz 703624 BLAKE2B f799ae4cb6373de4eee0d6b11fcf5db7d0ac912bcb46310dd13fb2c97e05a6434ab06907b96cfa4f67b3cb1b0976619b3d8bbadf4bd32e6769b5b10a0069d6fb SHA512 960c87e7cafbd8bbe8032b3f8446487ebdf048e1aa9fd4322a195d6540152fcba6e82fa94928d6050233f3222298a310dc638cc23197a6323d696d8f691c2703
diff --git a/kde-apps/kclock/kclock-21.12.ebuild b/kde-apps/kclock/kclock-22.06.ebuild
similarity index 88%
rename from kde-apps/kclock/kclock-21.12.ebuild
rename to kde-apps/kclock/kclock-22.06.ebuild
index e1e5206f40..6ce8906aac 100644
--- a/kde-apps/kclock/kclock-21.12.ebuild
+++ b/kde-apps/kclock/kclock-22.06.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
KFMIN=5.79.0
QTMIN=5.15.0
@@ -29,6 +29,8 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
>=kde-frameworks/plasma-${KFMIN}:5
"
RDEPEND="${DEPEND}
diff --git a/kde-apps/krecorder/Manifest b/kde-apps/krecorder/Manifest
index bac54e9fb6..90633f6b51 100644
--- a/kde-apps/krecorder/Manifest
+++ b/kde-apps/krecorder/Manifest
@@ -1,2 +1,2 @@
-DIST krecorder-21.12.tar.xz 137324 BLAKE2B e9e0a05a80efb910c2a046c79dbab347644534bc960b4ee6236be8c2e6b205a241c2328fd01aa7dd8f30f56d37da3c72e2b9fcf61e4868fe5a48ab27cd8f7094 SHA512 05e176c56109bc42bd1a10fec309c4500137be92fb0dadcdaf6781943951350e0fc600458d5b5be44da85eb29c1611c067c99c7136a328025c4b0d13d98268b1
DIST krecorder-22.02.tar.xz 145436 BLAKE2B a74aa2628dae65fb53d27808835f34a69615ca66481b0246800835cb20d7210e5492b3193f0533658b656b6a430bd86bad2f960f48c25c6ba098a786f2cbf450 SHA512 8fd4f7af0d95caa958e86a00cc4eee824ae96f53389939fb4694a1882c6b0073f34d16276725e2b4cfc1a25d905a83acf45073bbe83d974323ce4fd8ec9e96a2
+DIST krecorder-22.06.tar.xz 149452 BLAKE2B 988c63e49acab65500019affa4645319ff1a7a8a05da74b879afc4dc9a63f53f9e334f94bb536ca1238f38413a1bf2fdc38fd35741022572b06a1d300484b6ad SHA512 91968cbd3c9101d382d2d817355faf4de765234ce5e4338cad6c3439b997af378ab77c20cf1f85f0891a5957592523acb27536eb16083dfb2493fb0652a029d6
diff --git a/kde-apps/krecorder/krecorder-21.12.ebuild b/kde-apps/krecorder/krecorder-22.06.ebuild
similarity index 81%
rename from kde-apps/krecorder/krecorder-21.12.ebuild
rename to kde-apps/krecorder/krecorder-22.06.ebuild
index 23489cb3b1..dc2e6f1594 100644
--- a/kde-apps/krecorder/krecorder-21.12.ebuild
+++ b/kde-apps/krecorder/krecorder-22.06.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.82
+KFMIN=5.89.0
QTMIN=5.15.0
inherit ecm
@@ -11,7 +11,7 @@ DESCRIPTION="A convergent audio recording application for Plasma"
HOMEPAGE="https://apps.kde.org/krecorder/"
SRC_URI="mirror://kde/stable/plasma-mobile/${PV}/${P}.tar.xz"
-LICENSE="GPL-3+"
+LICENSE="CC-BY-4.0 GPL-3+"
SLOT="5"
KEYWORDS="~amd64 ~x86"
@@ -19,10 +19,12 @@ DEPEND="
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtmultimedia-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtquickcontrols2-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
"
diff --git a/kde-apps/plasma-settings/Manifest b/kde-apps/plasma-settings/Manifest
index 84cdce7e9d..a0e5bf6a6f 100644
--- a/kde-apps/plasma-settings/Manifest
+++ b/kde-apps/plasma-settings/Manifest
@@ -1 +1,2 @@
DIST plasma-settings-21.12.tar.xz 237316 BLAKE2B aa5aac899e3fbce9f81d1375bd7a767e07b7f794dcb7c3619a0f5fe68b8765810344a2c54984c7414f1286a16585bea56e70d04599ddbcf78e9434e8a2255435 SHA512 f332bc8dff61a51b12610b0c0e669a6f69bbee7147770aec3c326d84b8cef9ebdd80862917d5004c7a165d7846db4bf0a5e03a336bb3ae625c8e9e0df30329e2
+DIST plasma-settings-22.06.tar.xz 297740 BLAKE2B 266c1e7c83e2949ff7f8198e6eb5e5938de55df8a839adfb606646c8b242d4b50a67146e390c12c9091dc7ec88ad3105e48eca571e935659b291dab51d512283 SHA512 0807f27aced33c1ca6bfaf52268c33b158461a0d5734468cac725efb55d3868eeaa1cde14e477735f38530c5d328c317c0308e05ed9d04852eb3dd0210cb44b1
diff --git a/kde-apps/plasma-settings/plasma-settings-22.06.ebuild b/kde-apps/plasma-settings/plasma-settings-22.06.ebuild
new file mode 100644
index 0000000000..0d2c291c05
--- /dev/null
+++ b/kde-apps/plasma-settings/plasma-settings-22.06.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.86
+QTMIN=5.15.0
+inherit ecm
+
+DESCRIPTION="Settings application for Plasma Mobile"
+HOMEPAGE="https://plasma-mobile.org/"
+SRC_URI="mirror://kde/stable/plasma-mobile/${PV}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2+ LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ dev-libs/glib:2
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/kauth-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kpackage-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/modemmanager-qt-${KFMIN}:5
+ >=kde-frameworks/networkmanager-qt-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=kde-frameworks/solid-${KFMIN}:5
+ virtual/libcrypt:=
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/tokodon/Manifest b/kde-apps/tokodon/Manifest
index a851cbc8c4..474a8a7e4f 100644
--- a/kde-apps/tokodon/Manifest
+++ b/kde-apps/tokodon/Manifest
@@ -1,2 +1,2 @@
-DIST tokodon-21.12.tar.xz 61708 BLAKE2B de8cffb333662153a9709e2e29bd140b6601450886d5282242aaa199a17ede330a8e75f0b6fead63e181bc87c6bde64ffc870398ac2e8fa370d42ed979dccbc5 SHA512 e936a055f0175e9eb07e9937232746b56830530e465e47a6c2e02df76d284329fc8055bdcca7e85048976366bfd5fd900627628ca268c4b66c221833fb335555
DIST tokodon-22.02.tar.xz 67648 BLAKE2B 22c1647ef72ecf22ed0201911d48480579e7921e521229016c1f41fa67530f8dd39b1777f8b085e912d4413257e188b76f14c68e744360ded9072e2a61d0bef4 SHA512 3c5888d392ed5935ef71d38b54caffe097f1bcc1d10c1f65561764fea8b2a3cf2bf83465b8ec7a985cdd65f1866593b955f6c279f67ecac4190194905ee8c813
+DIST tokodon-22.06.tar.xz 140800 BLAKE2B b51c27ef63e64a960364988a79a085e493aa31189d2c256e7d618b263304d48e479957ac8bbc0661d27a8067a2a9c8a60859556b90dbe352b5330ab2a1b2cd6d SHA512 bf28621e69e78128f34673b842560c70fe9fd39b1f545b9096d48314c65f8f0ec32a75eb9576c80f61a40a3487352bd8a872f4a8dad949a26e9768ff96df41dc
diff --git a/kde-apps/tokodon/tokodon-21.12.ebuild b/kde-apps/tokodon/tokodon-22.06.ebuild
similarity index 86%
rename from kde-apps/tokodon/tokodon-21.12.ebuild
rename to kde-apps/tokodon/tokodon-22.06.ebuild
index 03cc64d3a3..1cc3b34012 100644
--- a/kde-apps/tokodon/tokodon-21.12.ebuild
+++ b/kde-apps/tokodon/tokodon-22.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,8 @@ SLOT="5"
KEYWORDS="~amd64 ~x86"
DEPEND="
- dev-libs/qtkeychain
+ dev-libs/qtkeychain:=
+ >=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtmultimedia-${QTMIN}:5
@@ -32,11 +33,8 @@ DEPEND="
>=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kitemmodels-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ x11-libs/libX11
"
RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed "s/SocialMedia//" -i org.kde.tokodon.desktop || die
- ecm_src_prepare
-}
diff --git a/kde-frameworks/kirigami-addons/Manifest b/kde-frameworks/kirigami-addons/Manifest
index 017b4f6b6b..e555c338cd 100644
--- a/kde-frameworks/kirigami-addons/Manifest
+++ b/kde-frameworks/kirigami-addons/Manifest
@@ -1 +1,2 @@
DIST kirigami-addons-0.2.tar.xz 53668 BLAKE2B d4de55654754ba32272e78151bd44df8c662ad923b735735b600c81e083a1e393405d53af275f48f804875a5be8d9dc2129ed4ce6eed8ca6bd99af59faf9f75e SHA512 6eeb02b2f4058413520399cce49fd5eb63e0191d016c02be363f42690be2cd3ebf0093b7f8ec13da9930f715d50b56ea04d082fac8e9a88acacc0a3d19b42fc3
+DIST kirigami-addons-0.3.tar.xz 74880 BLAKE2B dc5d7e9ef51e2bffd231f8768275038160adea8b362b191d12186a3ce969b12b97e890a04e6af318156d8ff4616ab84c77943a7cc2a72293d03578ce61d58165 SHA512 21b2a71e459ea9c9ffe9460909f7f62f0ed2160855867b75ff61cccafd4d20cc7b50b75343e03165be5e1ac2f98d6affa4946bafa22cc6a238288d355f9521d5
diff --git a/kde-frameworks/kirigami-addons/kirigami-addons-0.3.ebuild b/kde-frameworks/kirigami-addons/kirigami-addons-0.3.ebuild
new file mode 100644
index 0000000000..af0af8b3b2
--- /dev/null
+++ b/kde-frameworks/kirigami-addons/kirigami-addons-0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.91.0
+QTMIN=5.15.0
+inherit ecm virtualx
+
+DESCRIPTION="Convergent visual components for Kirigami-based applications"
+HOMEPAGE="https://invent.kde.org/libraries/kirigami-addons"
+SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) LGPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtnetwork-${QTMIN}:5
+ >=dev-qt/qtquickcontrols2-${QTMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_test() {
+ virtx ecm_src_test
+}
diff --git a/media-sound/mpvc/Manifest b/media-sound/mpvc/Manifest
index 42af16bcc2..2143b127f7 100644
--- a/media-sound/mpvc/Manifest
+++ b/media-sound/mpvc/Manifest
@@ -1,23 +1,27 @@
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
-DIST colored-1.9.3.crate 20062 BLAKE2B 43bea2edb35df0382def6b0d37a55ce0214732bb152eddafae0c23fae05c5f4c6f9f3b88c6f271c778d80990eedc52e02a46289abdf2b1e0ba692bd83d9913b6 SHA512 72a77360148b960662d62aa63313e235c155c761948ecc67d92f244a99fefc92ad133e1820634358130db841095027cd99b64a79aa6fa41a279e0d5d505aacd6
-DIST hermit-abi-0.1.14.crate 9556 BLAKE2B 03b27536c3a8ce98d26321439ea6d0b14785fa4dc1666f2bfc6142f4f79d003393aae4fa0e351f6eb3cee6719bdf14e32fc6e07f5aa6f75916cdd20d3c1f5be4 SHA512 a3b5eb8462f47d9a0d7342d45ded3c22578cc19bca05ea0856daf04f263d88b0ca1a4f4c1daec14708282dbc39efcc11e100a3a7fc2bdfa73522ce5575ee7b8d
-DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST clap-3.2.8.crate 208903 BLAKE2B 93598ddd7fe489b2072160b5880822dd4cf5ee7762946ac927b53fdee0f715267d9f7f6ad60e9e45f0dc93b16ddffa71414f7c46c755906f7a70fd1869a12990 SHA512 1cf2c86038c46af697ff23b7ffb9025f96d4fa025106e08bf9f85679e4a10c80ee4ccac0b8a6899e9923916e32c0572310385f21dac62afe4920dfa4fab813ba
+DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f
+DIST colored-2.0.0.crate 21619 BLAKE2B 5abcc05a95cd74a106c4e4f3c9b1722a7a9493c7d16c2d73f2a116d1d0d20f93d00c414a19871930e6286aa60cdcb0f4f4411ae059e7e76b7632cfca3a55ebe9 SHA512 c9ee830c1e8a32372ab8c7ce569701deaa6533fa369fc1b4c04bed57b1e686ed775fc76c3d9815ad21ee69cfc7c30d645abcbacad39081c7e37ff83ebb6d9e8a
+DIST hashbrown-0.12.1.crate 90855 BLAKE2B 0d38ca94f1a7b750b31bc5469ffc1fbdb79a789d0410dc51583f0319569c94ed03b7a8b5f02972cd370a48ad8252eaa6ecc6eca4cb92911ae7366992b9b43cba SHA512 a037554dda19d8c1d79e74fe59f0297855173a1bd0b119c8fbe724b18a07ec7c2475162213d2502483279712a46ff1247f1681aceb97f67c2e7a53b60779b418
+DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
+DIST indexmap-1.9.1.crate 54114 BLAKE2B 71e4968c85d5b3fac550590658f9fed72c754a9443221fc804efb97bd39b5fca7f894ee67f8d2c330bf212eb8a6b5c85879cd813ed56e3fc43a54f0bb689af5a SHA512 7eac99056123332ad38ef32eb65235c810e8b4d051d9b0ddd5582348c9cd3b162d36defe8e46a532e2066562f224e37fae94b52b4649ee9cfac7673b76a2513e
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
-DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
-DIST mpvc-1.0.9.tar.gz 33525 BLAKE2B 2ee43bdbedd5bb9383c8e404cc50f901f89b86a874c40c173ae20cfb82ff28403e79e921fdb2f5a4be1ee4e0ea2c4289002e38f6472f760cf95a253b1c424ab7 SHA512 7b1770f836828a49bf80922dfdd96cf5e3dd98e3de9f7ae3493b87669ba89e6511cb7ca790b4c03c8786560bca80e8b729c898109501a2388530c572dce43620
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST mpvc-1.1.0.tar.gz 33423 BLAKE2B 1369018d8a86ac44054952129ee3fcb4ff57385e5077be6ea8274e64310211c2f50713565371725e927ea2bd3c034c7f1a2d2913890fd2182ecb0a43ac549238 SHA512 ab19968d3d72db8dc69cff761024f6eab047680521c354937d599b108e387d29453762764e4540881d621f02a629012a7d618fb57e2454433fdc2e1bb83b71bd
DIST mpvipc-1.1.9.crate 22576 BLAKE2B 7462a531b597fc74289af7199d313f167d22d82081a417cee405a1350315d408850da3443e2f3438da4504889f6f31a43a023b55921b07904d6bd3f638444e57 SHA512 7721c731e4402776ca77d39350afe1d1bf75c89da595a09102c560f3f0b7ec3c8d8a5c89821d3131d57adabc8ff081d09e95c768b030dca8d082e449be28ddb0
-DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
-DIST serde_json-1.0.55.crate 114335 BLAKE2B 89118d6ad9c62b5177651a65391cef22258b3fbbfa85c8dbe38f99e7388a3a9a44f20db800ff2b62f0484bc1766d2cb7c9dc1088894aa18c2e50be5d45b98f77 SHA512 db81c9ddaae20ff5f712d8a2cbb58a95bfd139d9358797443c9ee10fb8af18f1396faf09f7335c249118feb32f52192734d61efcb0b40204ea58825056eea9c9
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
-DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
+DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
+DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
+DIST serde-1.0.138.crate 76271 BLAKE2B 9e5021cbb5e4bdc82f8bdb3f079a24cb7909acad498fcd7e38b03bc75e2675dfd99658507b3208f5b1fde69f79c29f546b16a4b1be17da0e4b155acd92dd6b6a SHA512 e303d863d5ebdef27c38047427789ab6d3c4e1034d3e2bdd4048c09ef0da0e5f5b2cb25d00e1d47269fcc345458cc496af4e1a0ba64a3d627205337144a1c854
+DIST serde_json-1.0.82.crate 144514 BLAKE2B dd4b5ee1b93f04be09b1c204f8484091d608acc3966ed4c8252a1d46003dd154666e2731e761828dda4123da5c45bda653f453454c5c7c11977aef05bd0e9e9a SHA512 39e4cb0d8b22c9beae6decb87b9692581698c6309b2e9fd78e5e199a200da563e7459d34435b7890e274e13357195392cab69d73d3ee2ff537c1667de32f92c3
+DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
+DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
+DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
+DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/media-sound/mpvc/mpvc-1.0.9.ebuild b/media-sound/mpvc/mpvc-1.1.0.ebuild
similarity index 58%
rename from media-sound/mpvc/mpvc-1.0.9.ebuild
rename to media-sound/mpvc/mpvc-1.1.0.ebuild
index 078957af33..c68e676a3e 100644
--- a/media-sound/mpvc/mpvc-1.0.9.ebuild
+++ b/media-sound/mpvc/mpvc-1.1.0.ebuild
@@ -6,28 +6,32 @@
EAPI=8
CRATES="
-ansi_term-0.11.0
-atty-0.2.14
-bitflags-1.2.1
-clap-2.33.1
-colored-1.9.3
-hermit-abi-0.1.14
-itoa-0.4.6
-lazy_static-1.4.0
-libc-0.2.71
-mpvipc-1.1.9
-log-0.4.16
-cfg-if-1.0.0
-ryu-1.0.5
-serde-1.0.114
-serde_json-1.0.55
-strsim-0.8.0
-textwrap-0.11.0
-unicode-width-0.1.7
-vec_map-0.8.2
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
+ atty-0.2.14
+ autocfg-1.1.0
+ bitflags-1.3.2
+ cfg-if-1.0.0
+ clap-3.2.8
+ clap_lex-0.2.4
+ colored-2.0.0
+ hashbrown-0.12.1
+ hermit-abi-0.1.19
+ indexmap-1.9.1
+ itoa-1.0.2
+ lazy_static-1.4.0
+ libc-0.2.126
+ log-0.4.17
+ mpvipc-1.1.9
+ os_str_bytes-6.1.0
+ ryu-1.0.10
+ serde-1.0.138
+ serde_json-1.0.82
+ strsim-0.10.0
+ termcolor-1.1.3
+ textwrap-0.15.0
+ winapi-0.3.9
+ winapi-i686-pc-windows-gnu-0.4.0
+ winapi-util-0.1.5
+ winapi-x86_64-pc-windows-gnu-0.4.0
"
inherit cargo
diff --git a/media-video/uxplay/metadata.xml b/media-video/uxplay/metadata.xml
index fcda2bdb87..cb636a72ac 100644
--- a/media-video/uxplay/metadata.xml
+++ b/media-video/uxplay/metadata.xml
@@ -1,5 +1,5 @@
-
+
vowstar@gmail.com
diff --git a/mpv-plugin/mpv_thumbnail_script/Manifest b/mpv-plugin/mpv_thumbnail_script/Manifest
index 4570f96b59..f8105c99e8 100644
--- a/mpv-plugin/mpv_thumbnail_script/Manifest
+++ b/mpv-plugin/mpv_thumbnail_script/Manifest
@@ -1 +1,2 @@
DIST mpv_thumbnail_script-0.4.8.tar.gz 2583047 BLAKE2B dabcc477b49ceac3b15ffcde0c6ff072797a42109a2a8a0b4bcb2a029964fe8b3095f45691b6a03924ad960c1643354f09bc370caa63aa64a3bfa2aadc94a326 SHA512 b28b8dc2b268725d15aa1f0ca2a8dd512d6eb5f9a520786a0d59beae79a1608b6e7a783c92cb75950f36c85893834acf85c75f457995248116c54fc1832792bd
+DIST mpv_thumbnail_script-0.4.9.tar.gz 2583482 BLAKE2B 195addae18b2876bec80ab64455bdeda026f135f407a92352b34687561da4fb02d9027005a88cc91632c97edc51e5108713ea90b2e6cd7a5e984ff6294e42cfb SHA512 1453f07d29dec36cca1af826d2c99354f0aa8092f0b753e9e3c0ecd00c52d6f1d82490c210d51693faec79d8bd34e71c8cddbabf51bcbdca3abde120544be6ed
diff --git a/mpv-plugin/mpv_thumbnail_script/mpv_thumbnail_script-0.4.9.ebuild b/mpv-plugin/mpv_thumbnail_script/mpv_thumbnail_script-0.4.9.ebuild
new file mode 100644
index 0000000000..21d82b623e
--- /dev/null
+++ b/mpv-plugin/mpv_thumbnail_script/mpv_thumbnail_script-0.4.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MPV_REQ_USE="lua"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit mpv-plugin python-any-r1
+
+DESCRIPTION="A Lua script to show preview thumbnails in mpv's OSC seekbar"
+HOMEPAGE="https://github.com/marzzzello/mpv_thumbnail_script"
+
+SRC_URI="https://github.com/marzzzello/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+
+BDEPEND="
+ ${PYTHON_DEPS}
+"
+
+MPV_PLUGIN_FILES=(
+ ${PN}_client_osc.lua
+ ${PN}_server.lua
+)
+
+src_compile() {
+ ${EPYTHON} concat_files.py -r "cat_osc.json" || die
+ ${EPYTHON} concat_files.py -r "cat_server.json" || die
+}
diff --git a/net-irc/srain/Manifest b/net-irc/srain/Manifest
index 6dd8ea9167..056268e638 100644
--- a/net-irc/srain/Manifest
+++ b/net-irc/srain/Manifest
@@ -1,2 +1,2 @@
-DIST srain-1.2.1.tar.gz 954668 BLAKE2B 20beb88761a387a041659ea11f852655daab9fdcd4b1d2f2b080bfa4dd9c19a61c12ebba9a581a10355d9249a6063dcdfea486dccb625622e68b57a4445afae7 SHA512 594cb65827ba3f4cf99820640103bdd1d67577df31e1fcb27f98722e243bcbab68420aff0c3f26cc7d0c149a4a8c256fc386709b8ff86d6b617c170f00c076f3
DIST srain-1.2.4.tar.gz 954684 BLAKE2B 9989715380f0fb702a8f43be77ee5cd6360f2e8ddb2d21e8f1e0741fe6aabe3869b42e9e1f36c642b8cbfb6e2419f14d4ccc682f7fd7b1dda0f3b1af5b69e59f SHA512 96d15f9d8bccc197b1bcda2c4707bdeea8e5cb33e3a8ad88ea5431b059c64e2ccb2e82897fcb1c02198420fed2c59148ff1c32f5f305cfffa88f096e41b42cb4
+DIST srain-1.4.0.tar.gz 1935950 BLAKE2B 7d3db119bcc07ccb427850530e551f643e202d3f2f276c8b347324f99474e57052368b8eed52e74ba6403a47b3bd4b7842ee007d9035bbba8e69beba8e3be9e6 SHA512 1708d1d1ec97c9f35a8702526a95bb60bf0ea50b742a76081508ef42a512e8c113ef1949c3b9f3db4585d8fb11cdb197f65fc7bc10480a533c69982c21185e55
diff --git a/net-irc/srain/srain-1.2.1.ebuild b/net-irc/srain/srain-1.2.1.ebuild
deleted file mode 100644
index 0f88306287..0000000000
--- a/net-irc/srain/srain-1.2.1.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
-
-inherit meson xdg
-
-DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
-HOMEPAGE="https://github.com/SrainApp/srain"
-SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="debug doc"
-
-RDEPEND="
- >=x11-libs/gtk+-3.22.0
- x11-libs/libnotify
-"
-DEPEND="
- ${RDEPEND}
- app-crypt/libsecret
- dev-libs/libconfig
- net-libs/libsoup
-"
-BDEPEND="dev-python/sphinx"
-
-src_prepare() {
- sed -i "s/'doc', meson.project_name())/'doc', meson.project_name() + '-${PV}')/" \
- meson.build || die
-
- xdg_src_prepare
-}
-
-src_configure() {
- local emesonargs=(
- --buildtype $(usex debug 'debug' 'plain')
- -Ddoc_builders="['man'$(usex doc ', "html"' '')]"
- )
- meson_src_configure
-}
diff --git a/net-irc/srain/srain-1.4.0.ebuild b/net-irc/srain/srain-1.4.0.ebuild
new file mode 100644
index 0000000000..3a75b9281c
--- /dev/null
+++ b/net-irc/srain/srain-1.4.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit meson python-any-r1 xdg
+
+DESCRIPTION="Modern, beautiful IRC client written in GTK+ 3"
+HOMEPAGE="https://github.com/SrainApp/srain"
+SRC_URI="https://github.com/SrainApp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc man"
+
+RDEPEND="
+ app-crypt/libsecret
+ dev-libs/glib:2
+ dev-libs/libconfig:=
+ dev-libs/openssl:=
+ net-libs/libsoup:2.4
+ x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ doc? ( ${PYTHON_DEPS} )
+ man? ( ${PYTHON_DEPS} )
+"
+
+python_check_deps() {
+ if use doc || use man; then
+ has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" || return 1
+ fi
+}
+
+src_prepare() {
+ default
+
+ sed "s/\('doc'\), meson.project_name()/\1, '${PF}'/" \
+ -i meson.build || die
+}
+
+src_configure() {
+ local -a doc_builders=()
+ use doc && doc_builders+=( html )
+ use man && doc_builders+=( man )
+
+ local emesonargs=(
+ -Ddoc_builders="$(meson-format-array "${doc_builders[@]}")"
+ )
+ meson_src_configure
+}
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 8d299e514a..85b6deb315 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,4 +1,4 @@
-DIST gmid-1.8.1.sha.sig 704 BLAKE2B 47a22ff05df3e1e18ca20d4846d2776e945ffad9bcd03085f3f1dd57a114af00e606d7f77833adf5c47bd66c12a36d25ac4eb3a0b7594af0ff917166a89a2c53 SHA512 284bbb38322bf28395d527f65427e2a628a2a67cd3e4eae21d8a9bc0a6bff1688e09bb701691043b2be2992cf4f342f372823ca1dedeb6b1313f2e3a470c600c
-DIST gmid-1.8.1.tar.gz 140350 BLAKE2B 4dba9f32ba8524bfa6f2c8eac9310e7b692e3bed8781eba427924c4ae9df3aa6259c5d88eaa6eb3c45a8b3e9f6d0ca266621147a552f8fec941fa246be479d66 SHA512 7304119bfb3d6a0b394a907217bfe2bd50e2082f1148ee6eb3ab0f261b57a903bfaa9ed57ca7fdac7c130dcd51ed0596afa53c4bbc8a3c35c660ccb0c5a33eeb
DIST gmid-1.8.3.sha.sig 1073 BLAKE2B e2f8ce0ef14e2300631ad00a32d6717bf88a1f65d5d3be327bec09d22d38d79fa023fcb7522b7b3b5aa436968e6b5be4d9b3c4dbd8d7176fe39540e7ef3dd2d8 SHA512 cfb0b4fc00e65c7c33ab522edd2a1e19b856e2c7932bf0f88d6501b596c5e6a9f067fe6e5ed8e9f573ea422fdf150682312fb034ffd2369bf41259b782ffeb10
DIST gmid-1.8.3.tar.gz 141650 BLAKE2B 1e079bb4314fbb5d34f1d0ad2faf035f6487c7df83d6b07b9763e4a2eb10dbd616f6b62dcfeab7a574a26803472b617cadebedaee455a57b257b1065ee965152 SHA512 2b54f8a65210d2312234dbef74f4c4eee39f2b2dc36a1f0a51946ac342a520c30e2a98f46f387ac1432e44a6df08facdb790d7fdfccab3dda546b3254c9cef75
+DIST gmid-1.8.4.sha.sig 587 BLAKE2B bcc6ababc3592f662445364c87a1ef7672cf881e853a0e7225b7d9420b7be99b1ccef0b6a3199f571b45a1bb59b9c8c311ef7094b006935bbcf74861e7344e5f SHA512 1b74f133e55a976b0ededeefec354442843118ad4c428fbc7e33598cf419b3a0b96aad9a32547f8e291c95e7dcc9519eb946fccde98105fdfc86edc31358e93d
+DIST gmid-1.8.4.tar.gz 111267 BLAKE2B bac9d3501239742d011d14f1a9c72e9ced8be85a5d730f678edbe4012a0c67472e1abc29b2edaf4bae4dc7f396de3c92b4d610838abd8e4802c98ed270c22522 SHA512 c2e53a8765ea6b994292fb3eda28f9737b6e7acbb9109a4140b24fb54efbb53c29e09153742339992fa2d2f3dea12059ce6afcd61f30bf2d15b6d073077af65a
diff --git a/net-misc/gmid/gmid-1.8.1.ebuild b/net-misc/gmid/gmid-1.8.4.ebuild
similarity index 89%
rename from net-misc/gmid/gmid-1.8.1.ebuild
rename to net-misc/gmid/gmid-1.8.4.ebuild
index 2fc1069487..00bbddd7a9 100644
--- a/net-misc/gmid/gmid-1.8.1.ebuild
+++ b/net-misc/gmid/gmid-1.8.4.ebuild
@@ -6,7 +6,7 @@ EAPI=8
SSL_DAYS=36500
SSL_CERT_MANDATORY=1
VERIFY_SIG_METHOD="signify"
-inherit ssl-cert systemd toolchain-funcs verify-sig
+inherit edo ssl-cert systemd toolchain-funcs verify-sig
DESCRIPTION="Simple and secure Gemini server"
HOMEPAGE="https://gmid.omarpolo.com"
@@ -45,7 +45,7 @@ fi
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
-DOCS=( README.md ChangeLog contrib/README )
+#DOCS=( README.md ChangeLog contrib/README )
src_unpack() {
if [[ ${PV} == 9999 ]]; then
@@ -68,30 +68,26 @@ src_configure() {
# note: not an autoconf configure script
conf_args=(
- PREFIX="${EPREFIX}"/usr/share
- BINDIR="${EPREFIX}"/usr/bin
+ PREFIX="${EPREFIX}"/usr
+ MANDIR="${EPREFIX}"/usr/share/man
$(use_enable seccomp sandbox)
)
- ./configure "${conf_args[@]}" || die
+ edo ./configure "${conf_args[@]}"
if use seccomp && has usersandbox ${FEATURES} ; then
export SKIP_RUNTIME_TESTS=1
fi
}
-src_test() {
- emake regress
-}
-
src_install() {
default
insinto /etc/gmid
doins "${FILESDIR}"/gmid.conf
- insinto /usr/share/vim/vimfiles
- doins -r contrib/vim/*
+ #insinto /usr/share/vim/vimfiles
+ #doins -r contrib/vim/*
systemd_dounit "${FILESDIR}"/gmid.service
newinitd "${FILESDIR}"/gmid.initd gmid
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index f7138233fe..dd7c358ebb 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -73,7 +73,7 @@ src_configure() {
$(use_enable seccomp sandbox)
)
- edo ./configure "${conf_args[@]}" || die
+ edo ./configure "${conf_args[@]}"
if use seccomp && has usersandbox ${FEATURES} ; then
export SKIP_RUNTIME_TESTS=1
diff --git a/net-misc/lyrics-in-terminal/Manifest b/net-misc/lyrics-in-terminal/Manifest
index 12535ee448..ec98ffb18c 100644
--- a/net-misc/lyrics-in-terminal/Manifest
+++ b/net-misc/lyrics-in-terminal/Manifest
@@ -1 +1,2 @@
DIST lyrics-in-terminal-1.4.2.tar.gz 1666425 BLAKE2B 1f72a07d8622d3fe21e0153ffd49166b937b3ef690c3262f100641c6fec67a6c0b1b59b88eee82b8dff243382f0bb0c7d897cf486f328cb16e12d9cbf9d96cb6 SHA512 5709518d926402897108d550568ba928679f90fefd50ab583ba4894679e5fe4d96accdb047fc9e0186b1e9a758c2f33ccc2b6d1db25471e99254b37eed37b1ff
+DIST lyrics-in-terminal-1.5.0.gh.tar.gz 1667797 BLAKE2B 70a4522cf694a3a83378504b684d295c7a9929d08980704f9b331104a3d9ae067cf3eb8df30f435c098b89e236ab00436344b08a2865b618e93084ce66128431 SHA512 e7cefc779c0e83861be4dadaf8324b13a37be7f952aedb0860bf0a636852c95f4829ab18d7585cf5f96cc38ea88fb60ece8455e3f155dc0d54006370a275e0f2
diff --git a/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.5.0.ebuild b/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.5.0.ebuild
new file mode 100644
index 0000000000..c9932221b3
--- /dev/null
+++ b/net-misc/lyrics-in-terminal/lyrics-in-terminal-1.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="ncurses"
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Command Line Lyrics fetcher for MPRIS media players"
+HOMEPAGE="https://github.com/Jugran/lyrics-in-terminal"
+SRC_URI="https://github.com/Jugran/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+
+pkg_postinst() {
+ optfeature "MPD player support" dev-python/python-mpd
+}
diff --git a/net-misc/ooni-probe-cli/Manifest b/net-misc/ooni-probe-cli/Manifest
index 1fddb2ce57..63e822f3ea 100644
--- a/net-misc/ooni-probe-cli/Manifest
+++ b/net-misc/ooni-probe-cli/Manifest
@@ -1,2 +1,2 @@
-DIST ooni-probe-cli-3.15.0.tar.gz 21374406 BLAKE2B 05fef6dacee64a58bab319d62c01976a29435b8b938f2c3fffe8f5e57801e1ecc39b4e1a02f1ef64550a13ae35139cb2ca035bf3c9e541ec9821e0fa224fc734 SHA512 b5795fe2ee8de25c3189568f479a6010119f2fb18d6f57642c4d23d9116056bd5a5db20f9eeebe9030705a0e0a65d1ecd57b1c71123d87297036b3affcf433e7
DIST ooni-probe-cli-3.15.1.tar.gz 21373619 BLAKE2B a3ea9aee05c5196e3c6afcc7d477003428a32324a93308655b30e473d5ddfd7321b2ff90e07b55749000dbe73a86a2b56797ef7d4c209289ee7ba04d27695c22 SHA512 ccf5b15a3f50109fa3e5b67d2c9c3d6b6b2c2fe96a6b398399bdb0e7ae6175e96951f663c617ec50d611dc9c41ddc2985655d8cd2c66d81f34fa276d4b85979f
+DIST ooni-probe-cli-3.15.3.tar.gz 21433465 BLAKE2B 163b14ec99f73e9cc7633c817549ffaf20930b6906519f37bc1e9f8fe0b3014111e5eef61f2de2bbe0672bc3af35065ee475171b3b6b8162a0afdeaa069a7a74 SHA512 0d5278a510f8ba7d6972fe36f89f0bc6e6e34bb0b30d2252b940316a662e02d142752b157330ab85878e67f03278195c7d0c9ab331e02700114e166de7712f88
diff --git a/net-misc/ooni-probe-cli/ooni-probe-cli-3.15.0.ebuild b/net-misc/ooni-probe-cli/ooni-probe-cli-3.15.3.ebuild
similarity index 100%
rename from net-misc/ooni-probe-cli/ooni-probe-cli-3.15.0.ebuild
rename to net-misc/ooni-probe-cli/ooni-probe-cli-3.15.3.ebuild
diff --git a/net-nntp/inn/inn-2.6.5.ebuild b/net-nntp/inn/inn-2.6.5.ebuild
index c6d5e32c4e..fccdcb5d4c 100644
--- a/net-nntp/inn/inn-2.6.5.ebuild
+++ b/net-nntp/inn/inn-2.6.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit optfeature perl-functions python-single-r1 systemd tmpfiles verify-sig
diff --git a/sci-geosciences/mapillary_tools/Manifest b/sci-geosciences/mapillary_tools/Manifest
index 82da7e9de1..9dacb6ef48 100644
--- a/sci-geosciences/mapillary_tools/Manifest
+++ b/sci-geosciences/mapillary_tools/Manifest
@@ -1,2 +1 @@
-DIST mapillary_tools-0.8.0.tar.gz 12080089 BLAKE2B a34b68a479ecb85f5a6e53e4e2ce7db92e6e59e7c07c5b7bd20c2153f372fd9ae83a23ded3bde8a655ddfd03146357728679232e186cb576290d55726faa8134 SHA512 45b2228f48874006aa46890f807bcd3c5cfb08036bc7c5b2182f39efced352cc6bf3fc1c49c386654a2f0ed08e1bdec5d6a542b4d43ca012f86891596e0ca870
-DIST mapillary_tools-0.8.2.tar.gz 14928332 BLAKE2B 434e6a97b69372b266b684276f816bc77c83e91bc9569d28b20c2b29e04e6ff1def1dbd269abb81bb14b0ad2155759c15c7485712747cbc5af48de58ab85409d SHA512 78843e7b571f54d9d42b71baf9a63a3f64ea67432c2a9c96f129db6d9511ce5f6070a36581eae5500778b41215d27ae892ccca9c62cd1fc82285cb0cbe9807cf
+DIST mapillary_tools-0.8.2_p20220702.gh.tar.gz 19125382 BLAKE2B 51e75c3cf5b6e129594e28c55d7ff75592c26a227d905749e42445678f2e69f410080d35bc5c4a9692710d98b42f03eec33130c79ed3608e1efc2465e28d5039 SHA512 0d32c3b78a44f1a6544ad69a66f9de2f4c9b87b5a7198546e5716bda055514e26ac05de6a3304e8610ba150f7e8346290925e7509f2db532cabcede0e48de1f6
diff --git a/sci-geosciences/mapillary_tools/mapillary_tools-0.8.0.ebuild b/sci-geosciences/mapillary_tools/mapillary_tools-0.8.0.ebuild
deleted file mode 100644
index 8e5e6ac766..0000000000
--- a/sci-geosciences/mapillary_tools/mapillary_tools-0.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command line tools for processing and uploading Mapillary imagery"
-HOMEPAGE="https://github.com/mapillary/mapillary_tools"
-SRC_URI="https://github.com/mapillary/mapillary_tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
-RDEPEND="
- >=dev-python/exifread-2.3.2[${PYTHON_USEDEP}]
- >=dev-python/piexif-1.1.3[${PYTHON_USEDEP}]
- >=dev-python/gpxpy-0.9.8[${PYTHON_USEDEP}]
- >=dev-python/pymp4-1.1.0[${PYTHON_USEDEP}]
- >=dev-python/pynmea2-1.12.0[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/tqdm-4.0[${PYTHON_USEDEP}]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/jsonschema[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
- >=dev-python/pillow-8.1.2[${PYTHON_USEDEP}]
- dev-python/pyinstaller[${PYTHON_USEDEP}]
- dev-python/types-python-dateutil[${PYTHON_USEDEP}]
- dev-python/types-pytz[${PYTHON_USEDEP}]
- dev-python/types-requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/sci-geosciences/mapillary_tools/mapillary_tools-0.8.2.ebuild b/sci-geosciences/mapillary_tools/mapillary_tools-0.8.2_p20220702.ebuild
similarity index 84%
rename from sci-geosciences/mapillary_tools/mapillary_tools-0.8.2.ebuild
rename to sci-geosciences/mapillary_tools/mapillary_tools-0.8.2_p20220702.ebuild
index 5e2c99c3f0..3aa745aa4d 100644
--- a/sci-geosciences/mapillary_tools/mapillary_tools-0.8.2.ebuild
+++ b/sci-geosciences/mapillary_tools/mapillary_tools-0.8.2_p20220702.ebuild
@@ -3,13 +3,15 @@
EAPI=8
+COMMIT="92624ccb416e9649bb93d6be04c8b3be03a44525"
PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
DESCRIPTION="Command line tools for processing and uploading Mapillary imagery"
HOMEPAGE="https://github.com/mapillary/mapillary_tools"
-SRC_URI="https://github.com/mapillary/mapillary_tools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/mapillary/mapillary_tools/archive/${COMMIT}.tar.gz -> ${PF}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="BSD"
KEYWORDS="~amd64"
@@ -19,7 +21,6 @@ RDEPEND="
>=dev-python/exifread-2.3.2[${PYTHON_USEDEP}]
>=dev-python/piexif-1.1.3[${PYTHON_USEDEP}]
>=dev-python/gpxpy-1.4.2[${PYTHON_USEDEP}]
- >=dev-python/pymp4-1.1.0[${PYTHON_USEDEP}]
>=dev-python/pynmea2-1.12.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
>=dev-python/tqdm-4.0[${PYTHON_USEDEP}]
diff --git a/sys-fs/dwarfs/dwarfs-0.5.6-r1.ebuild b/sys-fs/dwarfs/dwarfs-0.5.6-r1.ebuild
deleted file mode 100644
index 33a8917d2d..0000000000
--- a/sys-fs/dwarfs/dwarfs-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit cmake check-reqs python-single-r1
-
-DESCRIPTION="A fast very high compression read-only FUSE file system"
-HOMEPAGE="https://github.com/mhx/dwarfs"
-
-SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="python +jemalloc test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="sys-devel/flex"
-RDEPEND="${PYTHON_DEPS}
- dev-libs/boost[context,python?]
- dev-libs/double-conversion
- dev-libs/libfmt
- dev-libs/libevent
- dev-libs/xxhash
- jemalloc? ( >=dev-libs/jemalloc-5.2.1 )
- app-arch/libarchive
- app-arch/zstd
- app-arch/lz4
- app-arch/xz-utils
- app-arch/snappy
- dev-cpp/sparsehash
- dev-cpp/gflags
- dev-cpp/glog[gflags]
- sys-fs/fuse:3
- sys-libs/binutils-libs
- sys-libs/zlib
- sys-libs/libunwind
- !dev-cpp/folly"
-BDEPEND="app-text/ronn
- test? ( dev-cpp/gtest )
- dev-util/cmake
- sys-apps/sed
- sys-devel/bison
- virtual/pkgconfig"
-
-CHECKREQS_DISK_BUILD="1300M"
-
-DOCS=( "README.md" "CHANGES.md" "TODO" )
-
-CMAKE_IN_SOURCE_BUILD=1
-CMAKE_WARN_UNUSED_CLI=0
-
-src_prepare(){
- cmake_src_prepare
- einfo "setting library path to $(get_libdir)"
- sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
-}
-
-src_configure(){
- einfo "setting configuration flags to:"
- mycmakeargs=(
- -DUSE_JEMALLOC=$(usex jemalloc ON OFF)
- -DWITH_PYTHON=$(usex python ON OFF)
- -DWITH_TESTS=$(usex test ON OFF)
- -DPREFER_SYSTEM_ZSTD=1
- -DPREFER_SYSTEM_XXHASH=1
- -DPREFER_SYSTEM_GTEST=1
- -DWITH_LEGACY_FUSE=0
- )
- if use python; then mycmakeargs+=( -DWITH_PYTHON_VERSION=${EPYTHON#python} ); fi
- einfo ${mycmakeargs}
- cmake_src_configure
-}
-
-src_install(){
- cmake_src_install
- dolib.so libmetadata_thrift.so libthrift_light.so libdwarfs.so libfsst.so
- dolib.so folly/libfolly.so.0.58.0-dev folly/libfolly.so
-}
-
-pkg_postinst(){
- elog "Suggest to enable USE 'threads' globally if you have multicore machine"
- elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
- elog "You may find more information in the"
- elog "${HOMEPAGE}"
- elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
- elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
-}
diff --git a/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild b/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
deleted file mode 100644
index 0aa97f7eb4..0000000000
--- a/sys-fs/dwarfs/dwarfs-0.5.6-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit check-reqs cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A fast very high compression read-only FUSE file system"
-HOMEPAGE="https://github.com/mhx/dwarfs"
-SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="python +jemalloc test"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-arch/libarchive
- app-arch/lz4
- app-arch/snappy
- app-arch/xz-utils
- app-arch/zstd
- dev-cpp/fbthrift:=
- >=dev-cpp/folly-2021.04.19.00-r1:=
- dev-cpp/gflags
- dev-cpp/glog[gflags]
- dev-cpp/parallel-hashmap:=
- dev-cpp/sparsehash
- dev-libs/boost[context,threads(+),python?]
- dev-libs/double-conversion
- dev-libs/fsst:=
- dev-libs/libevent
- dev-libs/libfmt
- dev-libs/xxhash
- sys-fs/fuse:3
- sys-libs/binutils-libs
- sys-libs/libunwind
- sys-libs/zlib
-
- jemalloc? ( >=dev-libs/jemalloc-5.2.1 )
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/flex
-"
-BDEPEND="
- app-text/ronn
- sys-devel/bison
- virtual/pkgconfig
-
- test? ( dev-cpp/gtest )
-"
-
-DOCS=( "README.md" "CHANGES.md" "TODO" )
-RESTRICT="!test? ( test )"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
-
-CHECKREQS_DISK_BUILD="1300M"
-CMAKE_IN_SOURCE_BUILD=1
-CMAKE_WARN_UNUSED_CLI=0
-
-src_prepare(){
- rm -r fsst zstd fbthrift/* folly xxHash parallel-hashmap || die
- cmake_src_prepare
- sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
-}
-
-src_configure(){
- append-cxxflags "-I/usr/include"
-
- mycmakeargs=(
- -DUSE_JEMALLOC=$(usex jemalloc ON OFF)
- -DWITH_PYTHON=$(usex python ON OFF)
- -DWITH_TESTS=$(usex test ON OFF)
- -DPREFER_SYSTEM_ZSTD=1
- -DPREFER_SYSTEM_XXHASH=1
- -DPREFER_SYSTEM_GTEST=1
- -DWITH_LEGACY_FUSE=0
- )
- use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
- cmake_src_configure
-}
-
-src_install(){
- cmake_src_install
- dolib.so libdwarfs.so
-}
-
-pkg_postinst(){
- elog "Suggest to enable USE 'threads' globally if you have multicore machine"
- elog "Since version 0.4.1 GGC builds has been fixed. Now both Clang and GCC are working very well"
- elog "You may find more information in the"
- elog "${HOMEPAGE}"
- elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
- elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
-}
diff --git a/sys-fs/python-btrfs/Manifest b/sys-fs/python-btrfs/Manifest
index 6ef6e6aeb5..2aa86a14e3 100644
--- a/sys-fs/python-btrfs/Manifest
+++ b/sys-fs/python-btrfs/Manifest
@@ -1,2 +1 @@
-DIST python-btrfs-12.tar.gz 92369 BLAKE2B bc899900c4d436ca4ad940247ac6edc9022f09f604c4c9b78288065e8950a9ba86147d1d9992e2410edb9907a2e7748467b1ae92d33b21c6e7ab9149c84431e3 SHA512 93d7ac4b0c8cc62e5a89b0ffd269695c2c52a4111385ec00d2cb467b6d1c35e59a450c128ca4ddedf91955f51962092ec2e2431ce3d9243d25beeaa2d2ec38ac
DIST python-btrfs-13.tar.gz 93110 BLAKE2B 286e5d1d9aa66ce5072f2fe144b2da6bbcde65dd90eb21efe1eb69b9aaa3230d76e8b8baffcfd269ce5d53e1004b5fc6c5546125bc1a5c26413ba8abc66f068a SHA512 5117b9c6542fe191eccbed56a15bb5d8eadc2d3c0edd986a3e1a33d0b63f58c3db5e7f6d234c43a83d1cc74eea3e106c5882a92926c3087601edc36e6672721f
diff --git a/sys-fs/python-btrfs/python-btrfs-12.ebuild b/sys-fs/python-btrfs/python-btrfs-12.ebuild
deleted file mode 100644
index d652f1dec7..0000000000
--- a/sys-fs/python-btrfs/python-btrfs-12.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="no"
-
-inherit distutils-r1
-
-DESCRIPTION="Python 3 module to inspect btrfs filesystems"
-HOMEPAGE="https://github.com/knorrie/python-btrfs"
-SRC_URI="https://github.com/knorrie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_install_all() {
- use examples && local DOCS=( README.md CHANGES examples )
- distutils-r1_python_install_all
-}
diff --git a/sys-fs/python-btrfs/python-btrfs-13.ebuild b/sys-fs/python-btrfs/python-btrfs-13-r1.ebuild
similarity index 94%
rename from sys-fs/python-btrfs/python-btrfs-13.ebuild
rename to sys-fs/python-btrfs/python-btrfs-13-r1.ebuild
index d652f1dec7..615022760a 100644
--- a/sys-fs/python-btrfs/python-btrfs-13.ebuild
+++ b/sys-fs/python-btrfs/python-btrfs-13-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1
diff --git a/sys-kernel/modprobed-db/Manifest b/sys-kernel/modprobed-db/Manifest
new file mode 100644
index 0000000000..0df4a5f0d6
--- /dev/null
+++ b/sys-kernel/modprobed-db/Manifest
@@ -0,0 +1 @@
+DIST modprobed-db-2.46.gh.tar.gz 7210 BLAKE2B c7c5535a85c5a593fff507073120c8c355c8b46513bcb3b922be4a7d178be97aa3e84802a3d39c31a3219057f745fdb641f0a821fd4fe5d33acb48865e5090b2 SHA512 cf580bd386ca5fd232e96f33ecd61982d3ac4563f8e27b2b99bfbd2a8b8171585c8949df812ba8d85488c729570684983a63a6090ec3c05a890db5d6e864c05c
diff --git a/sys-kernel/modprobed-db/metadata.xml b/sys-kernel/modprobed-db/metadata.xml
new file mode 100644
index 0000000000..3a180300ea
--- /dev/null
+++ b/sys-kernel/modprobed-db/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ co-maintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ https://github.com/graysky2/modprobed-db/issues
+ graysky2/modprobed-db
+
+
diff --git a/sys-kernel/modprobed-db/modprobed-db-2.46.ebuild b/sys-kernel/modprobed-db/modprobed-db-2.46.ebuild
new file mode 100644
index 0000000000..55cf2ae904
--- /dev/null
+++ b/sys-kernel/modprobed-db/modprobed-db-2.46.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="This utility tracks modules loaded by the kernel, for localmodconfig"
+HOMEPAGE="https://github.com/graysky2/modprobed-db"
+SRC_URI="https://github.com/graysky2/modprobed-db/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_install() {
+ emake DESTDIR="${D}" install-bin
+ doman "doc/${PN}.8"
+ dodoc README.md
+}
diff --git a/www-apps/nitter/Manifest b/www-apps/nitter/Manifest
new file mode 100644
index 0000000000..21c4631d83
--- /dev/null
+++ b/www-apps/nitter/Manifest
@@ -0,0 +1,2 @@
+DIST nitter-0.1.0_p20220624.tar.gz 1177509 BLAKE2B 6aecaea8f0abd9d2568ddda6bb8e39f7fa92dedd1250622333fc8d61927501a40ecec5631484e4bb36e917c5bb51624055587e27e7bb5c367afaffcedf626320 SHA512 1b4dcdb06b0a8850fbc3e1a4ae8df9c35511e34dd41acf7e3c0e41943407ef7d21f2856b2996a7db73f8692f35acb481d4778b93996dfb7c494500032631e0f7
+DIST nitter-0.1.0_p20220705.tar.gz 1177516 BLAKE2B f76f4058e40afe4e9a084e52fa8f7726a782d1eb59a398adeb9b5750cfcf94bfeed0cbe21aa282cd5ad8d5d46e58d334e0eaa825e871338c5f4500e70c577e9a SHA512 efb7164590cb9975b983851cebdf94e9d675ffb93c2f6be1839198272ec68c85af5902c32e36781b401f775163945114cac73f8823cafee167d20356b9680f41
diff --git a/www-apps/nitter/files/nitter.conf.example b/www-apps/nitter/files/nitter.conf.example
new file mode 100644
index 0000000000..277f557734
--- /dev/null
+++ b/www-apps/nitter/files/nitter.conf.example
@@ -0,0 +1,48 @@
+# This is an example. Copy this file to /etc/nitter/nitter.conf and edit to
+# match your preferences.
+
+[Server]
+address = "0.0.0.0"
+port = 8080
+https = false # disable to enable cookies when not using https
+httpMaxConnections = 100
+staticDir = "/usr/share/nitter/public"
+title = "nitter"
+hostname = "nitter.net"
+
+[Cache]
+listMinutes = 240 # how long to cache list info (not the tweets, so keep it high)
+rssMinutes = 10 # how long to cache rss queries
+redisHost = "localhost" # Change to "nitter-redis" if using docker-compose
+redisPort = 6379
+redisPassword = ""
+redisConnections = 20 # connection pool size
+redisMaxConnections = 30
+# max, new connections are opened when none are available, but if the pool size
+# goes above this, they're closed when released. don't worry about this unless
+# you receive tons of requests per second
+
+[Config]
+hmacKey = "secretkey" # random key for cryptographic signing of video urls
+base64Media = false # use base64 encoding for proxied media urls
+enableRSS = true # set this to false to disable RSS feeds
+enableDebug = false # enable request logs and debug endpoints
+proxy = "" # http/https url, SOCKS proxies are not supported
+proxyAuth = ""
+tokenCount = 10
+# minimum amount of usable tokens. tokens are used to authorize API requests,
+# but they expire after ~1 hour, and have a limit of 187 requests.
+# the limit gets reset every 15 minutes, and the pool is filled up so there's
+# always at least $tokenCount usable tokens. again, only increase this if
+# you receive major bursts all the time
+
+# Change default preferences here, see src/prefs_impl.nim for a complete list
+[Preferences]
+theme = "Nitter"
+replaceTwitter = "nitter.net"
+replaceYouTube = "piped.kavin.rocks"
+replaceReddit = "teddit.net"
+replaceInstagram = "bibliogram.art"
+proxyVideos = true
+hlsPlayback = false
+infiniteScroll = false
diff --git a/www-apps/nitter/files/nitter.initd b/www-apps/nitter/files/nitter.initd
new file mode 100644
index 0000000000..1d26ed1cf4
--- /dev/null
+++ b/www-apps/nitter/files/nitter.initd
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${NITTER_CONF_FILE:="/etc/nitter/${RC_SVCNAME}.conf"}
+export NITTER_CONF_FILE
+
+command="/usr/bin/nitter"
+command_background=yes
+command_user="nitter:nitter"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+logpath="/var/log/nitter"
+output_log="${logpath}/${RC_SVCNAME}.log"
+error_log="${output_log}"
+
+depend() {
+ need redis
+ use net
+}
+
+start_pre() {
+ checkpath -do "${command_user}" "${logpath}"
+ checkpath -fo "${command_user}" "${output_log}"
+
+ if [ ! -f "${NITTER_CONF_FILE}" ]; then
+ eerror "Configuration file '${NITTER_CONF_FILE}' not found"
+ return 1
+ fi
+}
diff --git a/www-apps/nitter/files/nitter.service b/www-apps/nitter/files/nitter.service
new file mode 100644
index 0000000000..443fecd499
--- /dev/null
+++ b/www-apps/nitter/files/nitter.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Nitter
+After=network.service
+Requires=redis.service
+
+[Service]
+User=nitter
+Environment="NITTER_CONF_FILE=/etc/nitter/nitter.conf"
+ExecStart=/usr/bin/nitter
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/nitter/nitter-0.1.0_p20220624.ebuild b/www-apps/nitter/nitter-0.1.0_p20220624.ebuild
new file mode 100644
index 0000000000..acb82fc3c6
--- /dev/null
+++ b/www-apps/nitter/nitter-0.1.0_p20220624.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble systemd
+
+COMMIT="81ec41328d5684dd395f584254d723abee213ac0"
+DESCRIPTION="An alternative front-end for Twitter"
+HOMEPAGE="https://github.com/zedeus/nitter"
+SRC_URI="https://github.com/zedeus/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+ acct-user/nitter
+ dev-db/redis
+ dev-nim/flatty
+ dev-nim/jester
+ dev-nim/jsony
+ dev-nim/karax
+ dev-nim/nimcrypto
+ dev-nim/packedjson
+ dev-nim/redpool
+ dev-nim/supersnappy
+ dev-nim/zedeus_redis
+ dev-nim/zippy
+"
+DEPEND="
+ dev-nim/markdown
+ dev-nim/sass
+"
+
+src_configure() {
+ nimble_src_configure
+
+ # Error: unhandled exception: cannot open: public/lp.svg
+ ln -s "${S}"/public ${BUILD_DIR}/public || die
+}
+
+src_compile() {
+ nimble_src_compile
+ enim r tools/gencss
+ enim r tools/rendermd
+}
+
+src_install() {
+ nimble_src_install
+
+ newinitd "${FILESDIR}"/nitter.initd ${PN}
+ systemd_dounit "${FILESDIR}"/nitter.service
+
+ insinto /etc/nitter
+ doins "${FILESDIR}"/nitter.conf.example
+
+ insinto /usr/share/nitter
+ doins -r public
+}
diff --git a/www-apps/nitter/nitter-0.1.0_p20220705.ebuild b/www-apps/nitter/nitter-0.1.0_p20220705.ebuild
new file mode 100644
index 0000000000..9b8669c87e
--- /dev/null
+++ b/www-apps/nitter/nitter-0.1.0_p20220705.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble systemd
+
+COMMIT="0200cc21a32e0ed87025744066894cdc26f73ff3"
+DESCRIPTION="An alternative front-end for Twitter"
+HOMEPAGE="https://github.com/zedeus/nitter"
+SRC_URI="https://github.com/zedeus/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND="
+ acct-user/nitter
+ dev-db/redis
+"
+DEPEND="
+ dev-nim/flatty
+ dev-nim/jester
+ dev-nim/jsony
+ dev-nim/karax
+ dev-nim/markdown
+ dev-nim/nimcrypto
+ dev-nim/packedjson
+ dev-nim/redpool
+ dev-nim/sass
+ dev-nim/supersnappy
+ dev-nim/zedeus_redis
+ dev-nim/zippy
+"
+
+src_configure() {
+ nimble_src_configure
+
+ # Error: unhandled exception: cannot open: public/lp.svg
+ ln -s "${S}"/public ${BUILD_DIR}/public || die
+}
+
+src_compile() {
+ nimble_src_compile
+ enim r tools/gencss
+ enim r tools/rendermd
+}
+
+src_install() {
+ nimble_src_install
+
+ newinitd "${FILESDIR}"/nitter.initd ${PN}
+ systemd_dounit "${FILESDIR}"/nitter.service
+
+ insinto /etc/nitter
+ doins "${FILESDIR}"/nitter.conf.example
+
+ insinto /usr/share/nitter
+ doins -r public
+}
diff --git a/www-client/woob/woob-3.0-r1.ebuild b/www-client/woob/woob-3.0-r1.ebuild
index 24d0a16c3f..4322883bb0 100644
--- a/www-client/woob/woob-3.0-r1.ebuild
+++ b/www-client/woob/woob-3.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
if [[ "${PV}" == "9999" ]]; then
diff --git a/www-client/woob/woob-9999.ebuild b/www-client/woob/woob-9999.ebuild
index 24d0a16c3f..4322883bb0 100644
--- a/www-client/woob/woob-9999.ebuild
+++ b/www-client/woob/woob-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
if [[ "${PV}" == "9999" ]]; then