diff --git a/app-editors/bluegriffon-bin/Manifest b/app-editors/bluegriffon-bin/Manifest
deleted file mode 100644
index 326e413293..0000000000
--- a/app-editors/bluegriffon-bin/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST bluegriffon-bin-3.1.tar.bz2 281359437 BLAKE2B dddcf0dc38a9d7f6ad81047598ac62f5698e1771019e34aaaca29361f15a9cb603686e1c9f68848afda4c64dce2b5e36dd07c7e734b0cc2e0828bcf8be47cd89 SHA512 f069f0313523c7a32f286e3629f149728c565717252f17ce5f31eee2f58de53413edce8c60cc302704b4013913f7da995ce746fa25c1b13eea0551ecc946d28b
-DIST bluegriffon-bin.png 54142 BLAKE2B de0002498a22b0574bd9379e14c9bf4afb51f5a0c1cfb754514127844626ab7e8bf91daf80151b309af47a9c01bc472fa6f8135121d8014af854257847d38f16 SHA512 68f0ae4ce9566d7dbdda49c6c6572d888f121a5d89de3ce0d567f62f9e1062df4e72e9bf1b0fbe67dec7c583abd40dd706817e49653a28c09096bbb33b5bd207
diff --git a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r2.ebuild b/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r2.ebuild
deleted file mode 100644
index 031deaea36..0000000000
--- a/app-editors/bluegriffon-bin/bluegriffon-bin-3.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg desktop
-
-DESCRIPTION="The Open Source next-gen Web Editor based on the rendering engine of Firefox"
-HOMEPAGE="https://github.com/therealglazou/bluegriffon http://www.bluegriffon.org/"
-SRC_URI="http://bluegriffon.org/freshmeat/${PV}/bluegriffon-${PV}.Ubuntu18.04-x86_64.tar.bz2 -> ${P}.tar.bz2
-http://bluegriffon.org/BG_files/bluegriffon.png -> ${PN}.png"
-
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}/bluegriffon/"
-XDG_ECLASS_DESKTOPFILES="${FILESDIR}"
-XDG_ECLASS_ICONFILES="${FILESDIR}"
-
-BUNDLED_DEPEND="
- dev-libs/nspr
- dev-libs/nss
-"
-
-DEPEND="sys-libs/glibc"
-
-RDEPEND="
- ${DEPEND}
- ${BUNDLED_DEPEND}
- dev-libs/dbus-glib
- dev-libs/expat
- dev-libs/fribidi
- dev-libs/gobject-introspection
- dev-libs/libbsd
- dev-libs/libffi:0/7
- dev-libs/libpcre
- media-gfx/graphite2
- media-libs/freetype
- media-libs/harfbuzz:0/0.9.18
- media-libs/libpng:0/16
- sys-apps/util-linux
- virtual/opengl
- x11-libs/cairo
- x11-libs/gtk+:3
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXt
- x11-libs/pango
- x11-libs/pixman
-"
-
-QA_PREBUILT="/opt/bluegriffon/*"
-
-src_install() {
- dodir /opt/bluegriffon
- cp -ap "${S}"/* "${ED}"/opt/bluegriffon/ || die
- dosym ../../opt/bluegriffon/bluegriffon-bin /usr/bin/bluegriffon-bin
- doicon "${DISTDIR}/bluegriffon-bin.png"
- domenu "${FILESDIR}/bluegriffon-bin.desktop"
-}
diff --git a/app-editors/bluegriffon-bin/files/bluegriffon-bin.desktop b/app-editors/bluegriffon-bin/files/bluegriffon-bin.desktop
deleted file mode 100644
index e5de937024..0000000000
--- a/app-editors/bluegriffon-bin/files/bluegriffon-bin.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Bluegriffon(Binary)
-GenericName=Bluegriffon(Binary)
-Comment=Web and EPUB Editor
-Exec=bluegriffon-bin %u
-Icon=bluegriffon-bin
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-StartupWMClass=Bluegriffon
-Categories=Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;application/epub+zip
diff --git a/app-editors/bluegriffon-bin/metadata.xml b/app-editors/bluegriffon-bin/metadata.xml
deleted file mode 100644
index 563fa6d813..0000000000
--- a/app-editors/bluegriffon-bin/metadata.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
- marco@scardovi.com
- Marco Scardovi
-
- BlueGriffon
- The next-gen Web and EPUB Editor based on the rendering engine of Firefox
-
- « My HTML Editor is BlueGriffon, an intuitive, modern and robust application.
- I like that what I see is what I get on the Web. »
- Jeff Jaffe, CEO of the World Wide Web Consortium (W3C)
-
- « The HTML Editor I'm Using Today? BlueGriffon »
- Nick Longo, author of CoffeeCup, the very first HTML Editor
-
- « Dear @BlueGriffonApp , you saved my a$$ once again »
- Tristan Nitot, former President of Mozilla Europe
-
- BlueGriffon is a WYSIWYG content editor for the World Wide Web.
- It is based on the discontinued Nvu editor, which in turn is based on the Composer
- component of the Mozilla Application Suite. Powered by Gecko, the rendering engine of Firefox,
- it can edit Web pages in conformance to Web Standards. It runs on Microsoft Windows, macOS and Linux.
-
- BlueGriffon complies with the W3C's web standards. It can create and edit pages in accordance
- to HTML 4, XHTML 1.1, HTML 5 and XHTML 5. It supports CSS 2.1 and all parts of CSS 3 already
- implemented by Gecko. BlueGriffon also includes SVG-edit, an XUL-based editor for SVG that is
- originally distributed as an add-on to Firefox and was adapted to BlueGriffon.
-
- A version without the CSS Stylesheet editor is free to download and is available on Microsoft Windows,
- macOS and Linux.
-
- Many enhancements are available via add-ons. Most add-ons such as 'Project Manager', 'CSS Stylesheet editor',
- 'MathML Editor', 'Word Count' and 'FullScreen view/edit' must be paid for,
- while only two ('FireFTP' and 'Dictionaries') are free to download.
-
-
diff --git a/app-misc/diff-so-fancy/Manifest b/app-misc/diff-so-fancy/Manifest
new file mode 100644
index 0000000000..d9adbf2ead
--- /dev/null
+++ b/app-misc/diff-so-fancy/Manifest
@@ -0,0 +1 @@
+DIST diff-so-fancy-1.4.0.tar.gz 46216 BLAKE2B c68a41a74bfc4f280aa3a90d9cbf6c63dbecaa917e83bb6403dfa1ee3ea7837f5348d1a44fa7673ad5c65a3f2948d1e028865b21f6f04a0f495cc54755c99535 SHA512 b92bdf6d7868fe183f2ea7d655f9619c2059ff7d10901ed445762ed5baff0944528b1e409f36e5d47ce51eb39b106617f302a6926995aeab27324cb3e5f6f293
diff --git a/app-misc/diff-so-fancy/diff-so-fancy-1.4.0.ebuild b/app-misc/diff-so-fancy/diff-so-fancy-1.4.0.ebuild
new file mode 100644
index 0000000000..2e89c0d96e
--- /dev/null
+++ b/app-misc/diff-so-fancy/diff-so-fancy-1.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SRC_URI="https://github.com/so-fancy/diff-so-fancy/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Good-lookin' diffs. Actually... nah... The best-lookin' diffs."
+HOMEPAGE="https://github.com/so-fancy/diff-so-fancy"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+#RESTRICT="!test? ( test )"
+RESTRICT="test" #investigate
+RDEPEND=""
+DEPEND="
+ ${RDEPEND}
+ dev-lang/perl
+"
+BDEPEND="test? ( dev-util/bats )"
+PATCHES=( "${FILESDIR}/fix-path.patch" )
+DOCS=( README.md history.md pro-tips.md )
+
+src_install() {
+ dobin "${PN}"
+
+ insinto "/usr/share/${PN}"
+ doins lib/*
+
+ einstalldocs
+}
+
+src_test() {
+ bats test || die
+}
diff --git a/app-misc/diff-so-fancy/files/fix-path.patch b/app-misc/diff-so-fancy/files/fix-path.patch
new file mode 100644
index 0000000000..fc04cebcd6
--- /dev/null
+++ b/app-misc/diff-so-fancy/files/fix-path.patch
@@ -0,0 +1,11 @@
+--- a/diff-so-fancy
++++ b/diff-so-fancy
+@@ -9,7 +9,7 @@
+ use File::Basename; # For dirname
+ use Encode; # For handling UTF8 stuff
+ use Cwd qw(abs_path); # For realpath()
+-use lib dirname(abs_path(File::Spec->catdir($0))) . "/lib"; # Add the local lib/ to @INC
++use lib "/usr/share/diff-so-fancy";
+ use DiffHighlight;
+
+ use strict;
diff --git a/app-misc/diff-so-fancy/metadata.xml b/app-misc/diff-so-fancy/metadata.xml
new file mode 100644
index 0000000000..f6d5fdd00f
--- /dev/null
+++ b/app-misc/diff-so-fancy/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ co-maintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ so-fancy/diff-so-fancy
+ so-fancy/diff-so-fancy
+
+
diff --git a/dev-cpp/parallel-hashmap/parallel-hashmap-1.33.ebuild b/dev-cpp/parallel-hashmap/parallel-hashmap-1.33.ebuild
index 6fe10fac82..e2824c2e1c 100644
--- a/dev-cpp/parallel-hashmap/parallel-hashmap-1.33.ebuild
+++ b/dev-cpp/parallel-hashmap/parallel-hashmap-1.33.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit cmake
-DESCRIPTION="A family of header-only, very fast and memory-friendly hashmap and btree containers."
+DESCRIPTION="Family of header-only, fast and memory-friendly hashmap and btree containers"
HOMEPAGE="
https://greg7mdp.github.io/parallel-hashmap/
https://github.com/greg7mdp/parallel-hashmap
diff --git a/dev-java/gradle-base-services/Manifest b/dev-java/gradle-base-services/Manifest
deleted file mode 100644
index a856d17482..0000000000
--- a/dev-java/gradle-base-services/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gradle-6.8.2.tar.gz 24289300 BLAKE2B 304f4a5e909eda4cf442325693574510ab99df1cfa307da405be0abd1861f3b64ce2152d11c9f02fcc9fbfe6a1864b477944ef9155f2c89c14e997f271f415dd SHA512 0aca35513d5cfdd8f09d130e09476e049792bdc756392bf9078ad721cdc05c6f1d69bea398cb408572fc3e02991a2ca055bfc6934b0c1ba410c41d7322c286e8
diff --git a/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild b/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild
deleted file mode 100644
index 2cd1600f84..0000000000
--- a/dev-java/gradle-base-services/gradle-base-services-6.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="gradle-${PV}"
-
-DESCRIPTION="Build automation tool for JVM Languages, C(++), etc."
-HOMEPAGE="https://gradle.org"
-SRC_URI="https://github.com/gradle/gradle/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6.8"
-KEYWORDS="~amd64"
-
-CDEPEND="dev-java/javax-inject:0
-dev-java/slf4j-api:0
-dev-java/guava:20
-dev-java/commons-lang:2.1
-dev-java/commons-io:1
-dev-java/asm:7
-dev-java/gradle-base-annotations:${SLOT}
-dev-java/gradle-hashing:${SLOT}
-dev-java/gradle-build-operations:${SLOT}"
-
-JDK_DEPEND="dev-java/openjdk:11
-dev-java/openjdk-bin:11"
-
-RDEPEND="|| ( dev-java/openjdk-jre-bin:11 ${JDK_DEPEND} )
-${CDEPEND}"
-DEPEND="|| ( ${JDK_DEPEND} )
-${CDEPEND}"
-
-MY_PN="${PN/gradle-/}"
-S="${WORKDIR}/gradle-${PV}"
-JAVA_SRC_DIR="subprojects/${MY_PN}/src/main/java"
-JAVA_GENTOO_CLASSPATH="javax-inject
-slf4j-api
-guava-20
-commons-lang-2.1
-commons-io-1
-asm-7
-gradle-base-annotations-${SLOT}
-gradle-hashing-${SLOT}
-gradle-build-operations-${SLOT}"
-JAVA_PKG_WANT_TARGET=11
-JAVA_PKG_WANT_SOURCE=11
-JAVA_PKG_WANT_BUILD_VM="openjdk-bin-11 openjdk-11"
-RESTRICT="test"
diff --git a/dev-java/gradle-base-services/metadata.xml b/dev-java/gradle-base-services/metadata.xml
deleted file mode 100644
index cac9177ff0..0000000000
--- a/dev-java/gradle-base-services/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- kaiboma06@gmail.com
- Kaibo Ma
-
-
diff --git a/dev-libs/cglm/cglm-0.8.2.ebuild b/dev-libs/cglm/cglm-0.8.2-r1.ebuild
similarity index 78%
rename from dev-libs/cglm/cglm-0.8.2.ebuild
rename to dev-libs/cglm/cglm-0.8.2-r1.ebuild
index b3201d57d4..6c84b8aea4 100644
--- a/dev-libs/cglm/cglm-0.8.2.ebuild
+++ b/dev-libs/cglm/cglm-0.8.2-r1.ebuild
@@ -23,6 +23,18 @@ IUSE="doc"
BDEPEND="dev-util/meson
doc? ( dev-python/sphinx )"
+PATCHES=(
+ # Upstream patch: https://github.com/recp/cglm/commit/13269f4af8d3c95220f97746c968eac3ba122a32
+ "${FILESDIR}"/${PN}-0.8.2-fix-vec3-vec4.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ "-Dwerror=false"
+ )
+ meson_src_configure
+}
+
src_compile() {
default
meson_src_compile
diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild
index b3201d57d4..4009cf4499 100644
--- a/dev-libs/cglm/cglm-9999.ebuild
+++ b/dev-libs/cglm/cglm-9999.ebuild
@@ -23,6 +23,13 @@ IUSE="doc"
BDEPEND="dev-util/meson
doc? ( dev-python/sphinx )"
+src_configure() {
+ local emesonargs=(
+ "-Dwerror=false"
+ )
+ meson_src_configure
+}
+
src_compile() {
default
meson_src_compile
diff --git a/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch b/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch
new file mode 100644
index 0000000000..1819ab1a64
--- /dev/null
+++ b/dev-libs/cglm/files/cglm-0.8.2-fix-vec3-vec4.patch
@@ -0,0 +1,22 @@
+From 13269f4af8d3c95220f97746c968eac3ba122a32 Mon Sep 17 00:00:00 2001
+From: winter091
+Date: Sat, 1 May 2021 16:48:31 +0300
+Subject: [PATCH] fix typo: vec3 -> vec4
+
+---
+ include/cglm/call/vec4.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/cglm/call/vec4.h b/include/cglm/call/vec4.h
+index 28a3734..f56f599 100644
+--- a/include/cglm/call/vec4.h
++++ b/include/cglm/call/vec4.h
+@@ -99,7 +99,7 @@ glmc_vec4_scale(vec4 v, float s, vec4 dest);
+
+ CGLM_EXPORT
+ void
+-glmc_vec4_scale_as(vec3 v, float s, vec3 dest);
++glmc_vec4_scale_as(vec4 v, float s, vec4 dest);
+
+ CGLM_EXPORT
+ void
diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild
index aac110c091..4216d47ceb 100644
--- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit desktop xdg
+inherit desktop toolchain-funcs xdg
DESCRIPTION="Blackvoxel Video Game"
HOMEPAGE="https://www.blackvoxel.com/"
@@ -29,9 +29,14 @@ S="${WORKDIR}/${PN}_source_${PV//./_}"
PATCHES=(
"${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-savedir.patch
+ "${FILESDIR}"/${P}-dont-strip-files.patch
)
src_compile() {
+ export CXX="$(tc-getCXX)"
+ export CC="$(tc-getCC)"
+ export AR="$(tc-getAR)"
+
emake blackvoxeldatadir="/usr/share/${PN}" bindir="/usr/bin"
}
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
new file mode 100644
index 0000000000..7be84fbbf8
--- /dev/null
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
@@ -0,0 +1,69 @@
+From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001
+From: tastytea
+Date: Mon, 3 May 2021 03:05:19 +0200
+Subject: [PATCH] Don't strip files.
+
+---
+ Makefile | 10 +++++-----
+ src/sc_Squirrel3/sq/Makefile | 4 ++--
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a85dd7e..51cb0fd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
+ ifeq ($(OS),Windows_NT)
+ CPU_BITS=32
+ CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
+- LDFLAGS+= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
++ LDFLAGS+= -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
+ else
+ # Unix like operating systems
+ CPU_BITS= $(shell getconf LONG_BIT)
+@@ -28,18 +28,18 @@ else
+
+ ifeq ($(KERNELNAME),Linux)
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ LDFLAGS+=-zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ else ifeq ($(KERNELNAME), FreeBSD)
+ # To be done...
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ else ifeq ($(KERNELNAME), Darwin)
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
+ else
+ # Unknow kernel... trying default flags
+ CXXFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ endif
+ endif
+
+diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
+index 08fb2ef..8cc1cbc 100644
+--- a/src/sc_Squirrel3/sq/Makefile
++++ b/src/sc_Squirrel3/sq/Makefile
+@@ -12,13 +12,13 @@ SRCS= sq.c
+
+
+ sq32:
+- $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sqprof:
+ $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sq64:
+- $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sq64d:
+ $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+--
+2.26.3
+
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index c8e826c68d..f6f8572121 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -1,30 +1,183 @@
+From a4fbc416e1c9884353f743f84ca98207f792b502 Mon Sep 17 00:00:00 2001
+From: tastytea
+Date: Mon, 3 May 2021 02:26:12 +0200
+Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
+ variables.
+
+---
+ Makefile | 29 ++++++++++++++---------------
+ src/sc_Squirrel3/sq/Makefile | 8 ++++----
+ src/sc_Squirrel3/sqstdlib/Makefile | 16 ++++++++--------
+ src/sc_Squirrel3/squirrel/Makefile | 16 ++++++++--------
+ 4 files changed, 34 insertions(+), 35 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3fac7f3..a85dd7e 100644
--- a/Makefile
+++ b/Makefile
-@@ -11,7 +11,7 @@
- CC=g++
- LD=g++
+@@ -8,10 +8,9 @@ ifndef bindir
+ endif
+
+ # Base options
+-CC=g++
+-LD=g++
++CXX?=g++
PROGNAME=blackvoxel
-CFLAGS=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
-+CFLAGS+=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
++CXXFLAGS+=-I "src/sc_Squirrel3/include" -DCOMPILEOPTION_DEMO=0 -DDEVELOPPEMENT_ON=0 -DCOMPILEOPTION_SPECIAL=0 -DCOMPILEOPTION_DATAFILESPATH="\"$(blackvoxeldatadir)\""
SRC= $(wildcard src/*.cpp) $(wildcard src/z/*.cpp)
OBJ= $(SRC:src/%.cpp=obj/%.o)
-@@ -28,8 +28,7 @@
+@@ -19,8 +18,8 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
+
+ ifeq ($(OS),Windows_NT)
+ CPU_BITS=32
+- CFLAGS+= -O3 -c -fmessage-length=0 -march=i686
+- LDFLAGS= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
++ CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
++ LDFLAGS+= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
+ else
+ # Unix like operating systems
+ CPU_BITS= $(shell getconf LONG_BIT)
+@@ -28,31 +27,31 @@ else
KERNELNAME =$(shell uname -s)
ifeq ($(KERNELNAME),Linux)
- CFLAGS+= -O3 -c -fmessage-length=0
- LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
-+ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ CXXFLAGS+= -O3 -c -fmessage-length=0
++ LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
else ifeq ($(KERNELNAME), FreeBSD)
# To be done...
- CFLAGS+= -O3 -c -fmessage-length=0
-@@ -57,7 +56,7 @@
+- CFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ CXXFLAGS+= -O3 -c -fmessage-length=0
++ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ else ifeq ($(KERNELNAME), Darwin)
+- CFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
++ CXXFLAGS+= -O3 -c -fmessage-length=0
++ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib
+ else
+ # Unknow kernel... trying default flags
+- CFLAGS+= -O3 -c -fmessage-length=0
+- LDFLAGS=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
++ CXXFLAGS+= -O3 -c -fmessage-length=0
++ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
+ endif
+ endif
- squirrel:
-- cd src/sc_Squirrel3 ; make sq$(CPU_BITS)
-+ +make -C src/sc_Squirrel3 sq$(CPU_BITS)
+ obj/%.o: src/%.cpp
+ @mkdir -p obj/z
+- $(CC) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CXXFLAGS)
+
+ all: $(PROGNAME)
- clean:
- @rm -rf obj
+ $(PROGNAME): $(OBJ) squirrel
+- $(LD) -o $(PROGNAME) $(OBJ) $(LDFLAGS)
++ $(CXX) -o $(PROGNAME) $(OBJ) $(LDFLAGS)
+
+
+
+diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
+index c2cfc7e..08fb2ef 100644
+--- a/src/sc_Squirrel3/sq/Makefile
++++ b/src/sc_Squirrel3/sq/Makefile
+@@ -12,16 +12,16 @@ SRCS= sq.c
+
+
+ sq32:
+- g++ -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sqprof:
+- g++ -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sq64:
+- g++ -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ sq64d:
+- g++ -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
++ $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+
+ .PHONY: clean mrproper
+
+diff --git a/src/sc_Squirrel3/sqstdlib/Makefile b/src/sc_Squirrel3/sqstdlib/Makefile
+index 643d7fc..41ee3f7 100644
+--- a/src/sc_Squirrel3/sqstdlib/Makefile
++++ b/src/sc_Squirrel3/sqstdlib/Makefile
+@@ -26,23 +26,23 @@ SRCS= \
+
+
+ sq32:
+- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+- ar rc $(OUT) *.o
++ $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++ $(AR) rc $(OUT) *.o
+ rm *.o
+
+ sqprof:
+- gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+- ar rc $(OUT) *.o
++ $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++ $(AR) rc $(OUT) *.o
+ rm *.o
+
+ sq64:
+- gcc -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+- ar rc $(OUT) *.o
++ $(CC) -O2 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++ $(AR) rc $(OUT) *.o
+ rm *.o
+
+ sq64d:
+- gcc -O0 -g3 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+- ar rc $(OUT) *.o
++ $(CC) -O0 -g3 -m64 -fno-exceptions -D_SQ64 -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
++ $(AR) rc $(OUT) *.o
+
+ .PHONY: clean mrproper
+
+diff --git a/src/sc_Squirrel3/squirrel/Makefile b/src/sc_Squirrel3/squirrel/Makefile
+index b03257b..be2c281 100644
+--- a/src/sc_Squirrel3/squirrel/Makefile
++++ b/src/sc_Squirrel3/squirrel/Makefile
+@@ -37,23 +37,23 @@ SRCS= \
+
+
+ sq32:
+- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+- ar rc $(OUT) *.o
++ $(CC) -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++ $(AR) rc $(OUT) *.o
+ rm *.o
+
+ sqprof:
+- gcc -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+- ar rc $(OUT) *.o
++ $(CC) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++ $(AR) rc $(OUT) *.o
+ rm *.o
+
+ sq64:
+- gcc -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+- ar rc $(OUT) *.o
++ $(CC) -O2 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++ $(AR) rc $(OUT) *.o
+ rm *.o
+
+ sq64d:
+- gcc -O0 -g3 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+- ar rc $(OUT) *.o
++ $(CC) -O0 -g3 -m64 -D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
++ $(AR) rc $(OUT) *.o
+
+ .PHONY: clean mrproper
+
+--
+2.26.3
+
diff --git a/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild b/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild
index f20d9e52ae..94d4fde6cd 100644
--- a/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild
+++ b/net-fs/hubicfuse/hubicfuse-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,12 +12,10 @@ SLOT="0"
LICENSE="LGPL-3"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="libressl"
DEPEND="
net-misc/curl
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
sys-fs/fuse:0
sys-apps/file
dev-libs/libxml2
diff --git a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
index e601304dbb..d7d107c8cf 100644
--- a/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214.ebuild
@@ -23,7 +23,7 @@ SLOT="0"
IUSE="libuv +ssl static-libs"
DEPEND="
- libuv? ( dev-libs/libuv[static-libs?] )
+ libuv? ( dev-libs/libuv[static-libs(-)?] )
ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
"
RDEPEND="${DEPEND}"
diff --git a/net-libs/usockets/usockets-9999.ebuild b/net-libs/usockets/usockets-9999.ebuild
index 18e9a52555..e40b7ed25b 100644
--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
IUSE="libuv +ssl static-libs"
DEPEND="
- libuv? ( dev-libs/libuv[static-libs?] )
+ libuv? ( dev-libs/libuv[static-libs(-)?] )
ssl? ( >=dev-libs/openssl-1.1.0[static-libs?] )
"
RDEPEND="${DEPEND}"
diff --git a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
index 072bcd2502..e31d270e43 100644
--- a/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.4.1.ebuild
@@ -14,15 +14,14 @@ MY_PN="fort"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="caps libressl"
+IUSE="caps"
DEPEND="
acct-group/fort
acct-user/fort
caps? ( sys-libs/libcap )
dev-libs/jansson
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
"
RDEPEND="
${DEPEND}
diff --git a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
index c642fbdfc8..645a3e3e90 100644
--- a/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.4.2.ebuild
@@ -14,15 +14,14 @@ SRC_URI="https://github.com/NICMx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="caps libressl"
+IUSE="caps"
DEPEND="
acct-group/fort
acct-user/fort
caps? ( sys-libs/libcap )
dev-libs/jansson
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
"
RDEPEND="
${DEPEND}
diff --git a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
index 15a5660544..c3c640eac7 100644
--- a/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
+++ b/net-misc/FORT-validator/FORT-validator-1.5.0.ebuild
@@ -14,15 +14,14 @@ MY_PN="fort"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="caps libressl"
+IUSE="caps"
DEPEND="
acct-group/fort
acct-user/fort
caps? ( sys-libs/libcap )
dev-libs/jansson
- libressl? ( dev-libs/libressl:0= )
- !libressl? ( dev-libs/openssl:0= )
+ dev-libs/openssl:0=
"
RDEPEND="
${DEPEND}
diff --git a/net-misc/gemserv/Manifest b/net-misc/gemserv/Manifest
index bed6bdb322..fe7353b957 100644
--- a/net-misc/gemserv/Manifest
+++ b/net-misc/gemserv/Manifest
@@ -18,8 +18,8 @@ DIST futures-core-0.3.5.crate 13541 BLAKE2B 5eaee458fffdc57105e33c17e7d2b8eab82d
DIST futures-macro-0.3.5.crate 9673 BLAKE2B 5ceee18ca00098ae9b44f909c0f96b1eb08978a3bcaa460c00683ac3c49727c94983faaa4618f747600e52ec4b8f43acb78fd261cad62d79d35b36b9fbfd20f2 SHA512 413acd01d2e8e849c9425646f0c7eca95972139b61d233bc615791ea4cbd0eac908c949e15587de7ac7c260837cc312b8b3d428011df23bd2e7c36875d4ade0d
DIST futures-task-0.3.5.crate 11030 BLAKE2B 272de7f0a923bab04071b705b3b39683022538a756ccc22a8582f048c83155d6da12ab804e70cd32767c318b94f0f71ea0e7aa6d1f77491aabfc6ebae08f710e SHA512 9affcfe1c64ff66cef77615d39c2e69e40480aa7fb0d1a0b136edeb9533b336e3e1156bc0bb14120a812f0f8d3d3266c556d9f0e4eec147fdcc175b3183dba52
DIST futures-util-0.3.5.crate 132197 BLAKE2B 07cf5f757cd9bc663266b18025efe200fc911c6d829bca139db4c5dcddce5f5e5dbe62968c6c7b328a63a5f23d0a232087e162f926716029ff52c24923bb7c53 SHA512 f71bd29e113fc8aa3795904b3130dd6f09076e6a19e52e34702973b6428a1834d300fdd3c48259e7f27fc1252dcefc80a4b104962fe7e6e4e536322d0aa9c5a2
-DIST gemserv-0.4.4.tar.gz 17027 BLAKE2B 6c31df8bd505b67ea060af4a4121ff3c1ae1d9e75a8d0c8260e2a788e65d31fc04ff5133157e064cdde42bd196a6b37407920847c52a45aa8133d6a0977e756e SHA512 d73237d43b59fb44bbf037171ca65400a6b0c8f4196ffa368d2f08ce2afe5c200fbcc452c2f8e6157d035981ec045ba79bae29f1ec6fb2a7c1fd69b49c6c966d
-DIST gemserv-0.4.5.tar.gz 16699 BLAKE2B 7637faf9e547858f13a8f0de7917545db598b931042c4ab2383fc8d46d77227ce455133127a86851e2335184e3188de2d7b31fba13a6477cecfdab83d47ea273 SHA512 03b843f46fa17a33499519253d29e3cc0615d881b0ee612c5b7845200eb400b42bb2eb81c4000df7373b8e5a4e87cfbfe4760e06c780d5aa8833c5b3b4fb284a
+DIST gemserv-0.4.4.tar.gz 17076 BLAKE2B 1bee45eb78dfc576f2a70d964b972264a0a4fa928e1c96bc5c609b428281cee769e02419f437800b9d8a334acf31c73c284816558b63e8db5016003f45d6c8be SHA512 571da084bc6fb1121290c9af9d6793a71b67e71eb894080e05570e3f7a0bd278080db18142a1814f413147d5e31d84050195695a540e955c48b6b91831bd4ff3
+DIST gemserv-0.4.5.tar.gz 16739 BLAKE2B 71658f84c466bd233d9f2fd8ee88426b78d04e6c3ab70d4f80b0a6becf41c005ee09f2d8dad6118316cbd6c7614668b6d854e19a32623c19f6ed68250796ad4c SHA512 7be3dfc6600ad9d49e59236e0bfa65bf38d23e6964bf42595a9315d7f6bacaf34b921832c12306914781f861c561093ad9e8a6a567c2acb208e084700439b862
DIST generator-0.6.21.crate 28473 BLAKE2B 5f87df0528b8930cb7621d419b944301761d4a2f488f723e26697fc9e7f5acd3a2d6e138148ef734fd2865519958e19a492ccc0aa08fb189e7f1277c302f06c9 SHA512 d6da62cf4d37d22b250b8d27c364e870e22b9ff040dbafb5a3697244da7852ad6f4430b66cfb13f285728da5b180e048a918445022c1268ae393b0c6134ed256
DIST hermit-abi-0.1.14.crate 9556 BLAKE2B 03b27536c3a8ce98d26321439ea6d0b14785fa4dc1666f2bfc6142f4f79d003393aae4fa0e351f6eb3cee6719bdf14e32fc6e07f5aa6f75916cdd20d3c1f5be4 SHA512 a3b5eb8462f47d9a0d7342d45ded3c22578cc19bca05ea0856daf04f263d88b0ca1a4f4c1daec14708282dbc39efcc11e100a3a7fc2bdfa73522ce5575ee7b8d
DIST hermit-abi-0.1.15.crate 9597 BLAKE2B 012fdcd6ed09e4bfc9256d524648b0e7f65e9bc8dc6351d04249c492a0b5e836c529791f79fd144b9f09ae55462c034b9a3fbcff5b2abb40a7c78f7f8d78f64a SHA512 f81f6a87e0a182b5e49a2edf60f47243b7cbb116df5aa6a3354f1e230d4030bb5697ad4eb9abb6203ff66c1cfac1fc35b7d7e76dedc276767124ea4f41f97535
diff --git a/net-misc/gmid/gmid-1.6.1.ebuild b/net-misc/gmid/gmid-1.6.1.ebuild
index 3f3f487a7b..dbf6b69ac1 100644
--- a/net-misc/gmid/gmid-1.6.1.ebuild
+++ b/net-misc/gmid/gmid-1.6.1.ebuild
@@ -21,14 +21,13 @@ fi
LICENSE="ISC"
SLOT="0"
-IUSE="libressl"
PATCHES=( "${FILESDIR}"/${P}-make-pidfile.patch )
DEPEND="acct-user/gemini
dev-libs/libevent
- !libressl? ( dev-libs/libretls )
- libressl? ( dev-libs/libressl )"
+ dev-libs/libretls
+"
BDEPEND="sys-devel/flex
virtual/yacc"
RDEPEND="${DEPEND}"
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index 9398659da0..a5f8bc23bd 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -21,12 +21,11 @@ fi
LICENSE="ISC"
SLOT="0"
-IUSE="libressl"
DEPEND="acct-user/gemini
dev-libs/libevent
- !libressl? ( dev-libs/libretls )
- libressl? ( dev-libs/libressl )"
+ dev-libs/libretls
+"
BDEPEND="sys-devel/flex
virtual/yacc"
RDEPEND="${DEPEND}"
diff --git a/net-misc/megasync/megasync-4.3.8.0.ebuild b/net-misc/megasync/megasync-4.3.8.0.ebuild
index 3882e83930..8d91075813 100644
--- a/net-misc/megasync/megasync-4.3.8.0.ebuild
+++ b/net-misc/megasync/megasync-4.3.8.0.ebuild
@@ -24,25 +24,21 @@ fi
LICENSE="MEGA"
SLOT="0"
-IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl nautilus php python readline threads thunar"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus php python readline threads thunar"
RDEPEND="
app-arch/xz-utils
dev-libs/libgcrypt
dev-libs/libsodium
dev-libs/libuv
+ dev-libs/openssl:0=
media-libs/libpng
net-dns/c-ares
x11-themes/hicolor-icon-theme
cryptopp? ( dev-libs/crypto++ )
- curl? (
- !libressl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
- libressl? ( net-misc/curl[ssl,curl_ssl_libressl(-)] )
- )
+ curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
dolphin? ( kde-apps/dolphin )
freeimage? ( media-libs/freeimage )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
nautilus? ( >=gnome-base/nautilus-3 )
readline? ( sys-libs/readline:0 )
sqlite? ( dev-db/sqlite:3 )
diff --git a/net-misc/megasync/megasync-9999.ebuild b/net-misc/megasync/megasync-9999.ebuild
index 96fa9d46c5..64ae5753b5 100644
--- a/net-misc/megasync/megasync-9999.ebuild
+++ b/net-misc/megasync/megasync-9999.ebuild
@@ -23,25 +23,21 @@ fi
LICENSE="MEGA"
SLOT="0"
-IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java libressl nautilus php python readline threads thunar"
+IUSE="+cryptopp +curl +sqlite +zlib dolphin examples freeimage java nautilus php python readline threads thunar"
RDEPEND="
app-arch/xz-utils
dev-libs/libgcrypt
dev-libs/libsodium
dev-libs/libuv
+ dev-libs/openssl:0=
media-libs/libpng
net-dns/c-ares
x11-themes/hicolor-icon-theme
cryptopp? ( dev-libs/crypto++ )
- curl? (
- !libressl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
- libressl? ( net-misc/curl[ssl,curl_ssl_libressl(-)] )
- )
+ curl? ( net-misc/curl[ssl,curl_ssl_openssl(-)] )
dolphin? ( kde-apps/dolphin )
freeimage? ( media-libs/freeimage )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
nautilus? ( >=gnome-base/nautilus-3 )
readline? ( sys-libs/readline:0 )
sqlite? ( dev-db/sqlite:3 )
diff --git a/net-misc/tuxi/tuxi-9999.ebuild b/net-misc/tuxi/tuxi-9999.ebuild
index 41e43fa210..f434dd2802 100644
--- a/net-misc/tuxi/tuxi-9999.ebuild
+++ b/net-misc/tuxi/tuxi-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/Bugswriter/tuxi.git"
LICENSE="GPL-3"
SLOT="0"
-DEPEND="app-misc/pup-bin
+DEPEND="app-misc/pup
app-text/recode
app-misc/jq"
RDEPEND="${DEPEND}"
diff --git a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild
index c6c2b4b4b5..335787ea9d 100644
--- a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild
+++ b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.5.3.1.ebuild
@@ -25,6 +25,8 @@ DEPEND="
|| ( dev-dotnet/dotnet-sdk-bin dev-dotnet/dotnet-runtime-bin )
"
+QA_PREBUILT="*"
+
S="${WORKDIR}/${MY_PN}"
src_install() {
local LP=opentabletdriver
@@ -71,6 +73,6 @@ pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog "Please replug your tablet before attempting to use the driver"
fi
- #ewarn "If this is your first time installing,"
+ ewarn "otd-gui is currently broken while the daemon is running https://github.com/OpenTabletDriver/OpenTabletDriver/issues/1041"
#ewarn "please replug your tablet."
}
diff --git a/x11-drivers/OpenTabletDriver-bin/files/otd b/x11-drivers/OpenTabletDriver-bin/files/otd
index 76d0b66e4f..b5cdb9c090 100644
--- a/x11-drivers/OpenTabletDriver-bin/files/otd
+++ b/x11-drivers/OpenTabletDriver-bin/files/otd
@@ -1,5 +1,5 @@
#! /usr/bin/env bash
-cd /usr/share/opentabletdriver-bin
+cd /usr/share/OpenTabletDriver
if [ $# -eq 0 ]
then
if [[ ! -v DISPLAY ]] && [[ ! -v WAYLAND_DISPLAY ]]
diff --git a/x11-drivers/OpenTabletDriver-bin/files/otd-gui b/x11-drivers/OpenTabletDriver-bin/files/otd-gui
index f507003c49..800eebb1a8 100644
--- a/x11-drivers/OpenTabletDriver-bin/files/otd-gui
+++ b/x11-drivers/OpenTabletDriver-bin/files/otd-gui
@@ -1,3 +1,3 @@
#! /usr/bin/env bash
-cd /usr/share/opentabletdriver-bin
-dotnet ./OpenTabletDriver.UX.Gtk.dll "$@"
\ No newline at end of file
+cd /usr/share/OpenTabletDriver
+dotnet ./OpenTabletDriver.UX.Gtk.dll "$@"