diff --git a/dev-libs/libQuotient/Manifest b/dev-libs/libQuotient/Manifest
deleted file mode 100644
index 5600d6cf18..0000000000
--- a/dev-libs/libQuotient/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libQuotient-0.6.2.tar.gz 557665 BLAKE2B 214d9c752a2f1907cd99aab6d893342d8547cf21e0a700f72f70af11ed639de48a7dcf059b221c3e2cf5f1c01449a3c2140d6118ad95f727b551f60c9f3b53ca SHA512 6388b142675b1f11864c8f0388b0039311a6306feeb6e053060b0ccc737e4e3f97698268314d8802cac2402ea5f2b90a3fce5a10c4966b98e67c7d97bb2b39db
diff --git a/dev-libs/libQuotient/libQuotient-0.6.2.ebuild b/dev-libs/libQuotient/libQuotient-0.6.2.ebuild
deleted file mode 100644
index f5b1d6f1f4..0000000000
--- a/dev-libs/libQuotient/libQuotient-0.6.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A Qt5 library to write cross-platform clients for Matrix"
-HOMEPAGE="https://github.com/quotient-im/libQuotient"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/quotient-im/${PN}"
-else
- SRC_URI="https://github.com/quotient-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-qt/qtgui
- dev-qt/qtnetwork
- dev-qt/qtmultimedia
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/libQuotient/metadata.xml b/dev-libs/libQuotient/metadata.xml
deleted file mode 100644
index 01c1fc8487..0000000000
--- a/dev-libs/libQuotient/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- davidroman96@gmail.com
- David Roman
-
-
diff --git a/gui-apps/nwg-launchers/Manifest b/gui-apps/nwg-launchers/Manifest
index 823953f3e5..ffcd138f4a 100644
--- a/gui-apps/nwg-launchers/Manifest
+++ b/gui-apps/nwg-launchers/Manifest
@@ -1,2 +1,2 @@
-DIST nwg-launchers-0.4.1.tar.gz 49118 BLAKE2B db8344c2138a71e617218c7c9bc277e759e3f055867804cef6253a865ee0b738a5926271f0c00e33661a8a4cf61dcc15d8df948280703ef8c4ac504aa5c7982f SHA512 51b97535f7db691a0fed39a993a66835aa1190a1623800cc6c9454d416dfd5277510c310f4210753c5ceabb864cd8445b83d13dff59792459b5defaf0598cdad
DIST nwg-launchers-0.4.2.tar.gz 49127 BLAKE2B f09f957c4c8f4c41d11d953abbc59d096a64a8ab51d6a57bcfacbe127580fa0476f0d72ab37d87a2d49c2b76596f8fd35369b66ea6fa9b32f7050dc3f29cb6c4 SHA512 6489c34e8f72ed6bd5a684b1a87e3d2611e4ee7bd48840105af91dfc0f95a29b0ff801aa90f793b82b49a31f5001f61329a029f0c63e028933223d195efdd52a
+DIST nwg-launchers-0.4.3.tar.gz 50615 BLAKE2B ff10a4438f371e8cf3166dc289dfe6a2266d8a332d50312563e0878b786e4e214c9828cf8d424ba552f3d07a36b30e922b7c381b386d315e784862ca8c979086 SHA512 6e280868019c3a657f49e48439efbe98d7ddf387cabeb03f41f987d060ef0b07e9bdd2e685fa462ade6baa9d867512b40d671e5085684451986801b339f28534
diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.1.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.4.1.ebuild
deleted file mode 100644
index dee57da34a..0000000000
--- a/gui-apps/nwg-launchers/nwg-launchers-0.4.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == 9999 ]]
-then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/nwg-piotr/nwg-launchers.git"
-else
- SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-inherit meson
-
-DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs"
-HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-RDEPEND="
- x11-libs/gtk+:3
- dev-cpp/gtkmm:3.0
- dev-cpp/nlohmann_json"
-DEPEND="${RDEPEND}"
-
-IUSE="+bar +dmenu +grid"
-
-RESTRICT="mirror test"
-
-src_configure() {
- meson_src_configure $(meson_use bar) $(meson_use dmenu) $(meson_use grid)
-}
diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild
index 914a82d851..8b26640731 100644
--- a/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild
+++ b/gui-apps/nwg-launchers/nwg-launchers-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ else
SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
-inherit meson
+inherit meson xdg
DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs"
HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers"
@@ -25,6 +25,8 @@ RDEPEND="
dev-cpp/nlohmann_json"
DEPEND="${RDEPEND}"
+RESTRICT="mirror"
+
IUSE="+bar +dmenu +grid"
src_configure() {
diff --git a/gui-apps/nwg-launchers/nwg-launchers-0.4.2.ebuild b/gui-apps/nwg-launchers/nwg-launchers-0.4.3.ebuild
similarity index 77%
rename from gui-apps/nwg-launchers/nwg-launchers-0.4.2.ebuild
rename to gui-apps/nwg-launchers/nwg-launchers-0.4.3.ebuild
index dc44e26d60..8b26640731 100644
--- a/gui-apps/nwg-launchers/nwg-launchers-0.4.2.ebuild
+++ b/gui-apps/nwg-launchers/nwg-launchers-0.4.3.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
@@ -11,11 +11,11 @@ else
SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
-inherit meson
+inherit meson xdg
DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs"
HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers"
-LICENSE="GPL-3"
+LICENSE="GPL-3 CC-BY-SA-3.0"
SLOT="0"
@@ -25,10 +25,17 @@ RDEPEND="
dev-cpp/nlohmann_json"
DEPEND="${RDEPEND}"
-IUSE="+bar +dmenu +grid"
-
RESTRICT="mirror"
+IUSE="+bar +dmenu +grid"
+
src_configure() {
meson_src_configure $(meson_use bar) $(meson_use dmenu) $(meson_use grid)
}
+
+src_install() {
+ meson_src_install
+
+ insinto /usr/share/icons/nwg-launchers
+ doins -r "${FILESDIR}"/.
+}
diff --git a/gui-apps/nwg-launchers/nwg-launchers-9999.ebuild b/gui-apps/nwg-launchers/nwg-launchers-9999.ebuild
index 914a82d851..8b26640731 100644
--- a/gui-apps/nwg-launchers/nwg-launchers-9999.ebuild
+++ b/gui-apps/nwg-launchers/nwg-launchers-9999.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
@@ -11,7 +11,7 @@ else
SRC_URI="https://github.com/nwg-piotr/nwg-launchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
-inherit meson
+inherit meson xdg
DESCRIPTION="GTK+ launchers for sway, i3 and some other WMs"
HOMEPAGE="https://github.com/nwg-piotr/nwg-launchers"
@@ -25,6 +25,8 @@ RDEPEND="
dev-cpp/nlohmann_json"
DEPEND="${RDEPEND}"
+RESTRICT="mirror"
+
IUSE="+bar +dmenu +grid"
src_configure() {
diff --git a/kde-apps/neochat/Manifest b/kde-apps/neochat/Manifest
deleted file mode 100644
index 8cd550dbd5..0000000000
--- a/kde-apps/neochat/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST neochat-1.0.tar.gz 164126 BLAKE2B 3bbf963c9aeaf0f76760a647e4c086d2c4c0adb80275f56f92e5654673a7523e0c582b2eab24044bd26006d5e40b99cd159d9d11a5095f87229b5496c634ca7c SHA512 e428c3e6f15192f85287647a6bc90e0a970ca06f67f75dab25f5f8fd40392cb97c3346ef5b6ceba24db227e48c3d58b518937f6651d90633ac94f93f4793763d
diff --git a/kde-apps/neochat/metadata.xml b/kde-apps/neochat/metadata.xml
deleted file mode 100644
index 01c1fc8487..0000000000
--- a/kde-apps/neochat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- davidroman96@gmail.com
- David Roman
-
-
diff --git a/kde-apps/neochat/neochat-1.0.ebuild b/kde-apps/neochat/neochat-1.0.ebuild
deleted file mode 100644
index bb2922c79a..0000000000
--- a/kde-apps/neochat/neochat-1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="A client for matrix, the decentralized communication protocol"
-HOMEPAGE="https://invent.kde.org/network/neochat"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://invent.kde.org/network/neochat.git"
-else
- SRC_URI="https://invent.kde.org/network/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
- app-text/cmark
- dev-libs/libQuotient
- dev-qt/qtgui
- dev-libs/qtkeychain
- dev-qt/qtnetwork
- dev-qt/qtsvg
- kde-frameworks/kconfig
- kde-frameworks/kcoreaddons
- kde-frameworks/kdbusaddons
- kde-frameworks/ki18n
- kde-frameworks/kirigami
- kde-frameworks/knotifications
- kde-frameworks/kquickimageeditor
-
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
diff --git a/kde-frameworks/kquickimageeditor/Manifest b/kde-frameworks/kquickimageeditor/Manifest
deleted file mode 100644
index 01524ae7da..0000000000
--- a/kde-frameworks/kquickimageeditor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kquickimageeditor-0.1.2.tar.gz 4469651 BLAKE2B 6628949a3623bfd29689e486c4baa58ae0c3b7507bc4f6b89c9d565fce9a1cdb8673bbf37c9ad4826f5e5269ab5bcfa6ce67d0733b043fd57f76fd52dbecfba0 SHA512 e7cfe50420682bd31809398ebc65f9a26ba6499b23970bc35f07c9ab7f58c171057597e027305d679f74b30296fd5ac6d6070a6104ad65d36bf4780c92c7a31b
diff --git a/kde-frameworks/kquickimageeditor/kquickimageeditor-0.1.2.ebuild b/kde-frameworks/kquickimageeditor/kquickimageeditor-0.1.2.ebuild
deleted file mode 100644
index ff27b8690a..0000000000
--- a/kde-frameworks/kquickimageeditor/kquickimageeditor-0.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="QtQuick components providing basic image editing capabilities"
-HOMEPAGE="https://invent.kde.org/libraries/kquickimageeditor"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://invent.kde.org/libraries/${PN}.git"
-else
- SRC_URI="https://invent.kde.org/libraries/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND="
- dev-qt/qtcore
- dev-qt/qtquickcontrols2
-"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/kquickimageeditor-v0.1.2"
diff --git a/kde-frameworks/kquickimageeditor/metadata.xml b/kde-frameworks/kquickimageeditor/metadata.xml
deleted file mode 100644
index 01c1fc8487..0000000000
--- a/kde-frameworks/kquickimageeditor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- davidroman96@gmail.com
- David Roman
-
-
diff --git a/sci-electronics/bsc/bsc-9999.ebuild b/sci-electronics/bsc/bsc-9999.ebuild
index d76b4f5f56..163f49ecfb 100644
--- a/sci-electronics/bsc/bsc-9999.ebuild
+++ b/sci-electronics/bsc/bsc-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-DESCRIPTION="Bluespec High Level Hardware Design Language"
+DESCRIPTION="Bluespec high level hardware design language compiler"
HOMEPAGE="https://github.com/B-Lang-org/bsc"
if [[ ${PV} == "9999" ]] ; then
@@ -16,6 +16,8 @@ fi
LICENSE="BSD GPL-3+ MIT"
SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND="
dev-haskell/old-time:0=
@@ -38,6 +40,17 @@ BDEPEND="
sys-devel/flex
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-9999-fix-libdir.patch
+ "${FILESDIR}"/${PN}-9999-fix-wrapper.patch
+)
+
+DOCS=( "README.md" "COPYING" )
+
+# We don't want to run it because it will do install by default.
+src_compile() { :; }
+
src_install() {
- emake PREFIX="${D}" install
+ emake PREFIX="${ED%/}"/usr LIBDIR="${ED%/}"/usr/$(get_libdir) install
+ einstalldocs
}
diff --git a/sci-electronics/bsc/files/bsc-9999-fix-libdir.patch b/sci-electronics/bsc/files/bsc-9999-fix-libdir.patch
new file mode 100644
index 0000000000..e0afdb4c50
--- /dev/null
+++ b/sci-electronics/bsc/files/bsc-9999-fix-libdir.patch
@@ -0,0 +1,250 @@
+diff --git a/Makefile b/Makefile
+index 4938b24..51e265b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,6 +3,7 @@ TOP := $(PWD)
+
+ PREFIX ?= $(TOP)/inst
+ BUILDDIR ?= $(TOP)/build
++LIBDIR ?= $(PREFIX)/lib
+
+ .PHONY: all
+ all: install
+@@ -21,7 +22,7 @@ rem_build:
+
+ .PHONY: install
+ install:
+- $(MAKE) -C src PREFIX=$(PREFIX) install
++ $(MAKE) -C src PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) install
+
+ # In the future, this will be much more expansive, and run the actual test
+ # suite once it's open sourced.
+diff --git a/src/Makefile b/src/Makefile
+index 1daeb3a..b5a1146 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -4,6 +4,7 @@ TOP := $(PWD)/..
+ include $(TOP)/platform.mk
+
+ PREFIX?=$(TOP)/inst
++LIBDIR?=$(PREFIX)/lib
+
+ ifndef NO_DEPS_CHECKS
+ CC_TOOLS=$(CC) $(CXX) $(LD)
+@@ -45,17 +46,17 @@ all: install
+
+ .PHONY: install clean full_clean
+ install clean full_clean:
+- $(MAKE) -C vendor/stp PREFIX=$(PREFIX) $@
+- $(MAKE) -C vendor/yices PREFIX=$(PREFIX) $@
+- $(MAKE) -C vendor/htcl PREFIX=$(PREFIX) $@
++ $(MAKE) -C vendor/stp PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C vendor/yices PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C vendor/htcl PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
+ # we need to build targets from here sequentially, as they operate in the same workspace
+- $(MAKE) -C comp -j1 PREFIX=$(PREFIX) $@
+- $(MAKE) -C Libraries PREFIX=$(PREFIX) $@
+- $(MAKE) -C exec PREFIX=$(PREFIX) $@
+- $(MAKE) -C VPI PREFIX=$(PREFIX) $@
+- $(MAKE) -C Verilog PREFIX=$(PREFIX) $@
+- $(MAKE) -C Verilog.Quartus PREFIX=$(PREFIX) $@
+- $(MAKE) -C Verilog.Vivado PREFIX=$(PREFIX) $@
+- $(MAKE) -C bluetcl PREFIX=$(PREFIX) $@
+- $(MAKE) -C bluesim PREFIX=$(PREFIX) $@
++ $(MAKE) -C comp -j1 PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C Libraries PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C exec PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C VPI PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C Verilog PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C Verilog.Quartus PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C Verilog.Vivado PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C bluetcl PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
++ $(MAKE) -C bluesim PREFIX=$(PREFIX) LIBDIR=$(LIBDIR) $@
+
+diff --git a/src/VPI/Makefile b/src/VPI/Makefile
+index 698037b..0070714 100644
+--- a/src/VPI/Makefile
++++ b/src/VPI/Makefile
+@@ -6,7 +6,8 @@ include $(TOP)/platform.mk
+ INSTALL ?= install
+
+ PREFIX?=$(TOP)/inst
+-INSTALLDIR=$(PREFIX)/lib/VPI
++LIBDIR?=$(PREFIX)/lib
++INSTALLDIR=$(LIBDIR)/VPI
+
+ .PHONY: all
+ all: install
+diff --git a/src/Verilog/common.mk b/src/Verilog/common.mk
+index ef29190..06b3553 100644
+--- a/src/Verilog/common.mk
++++ b/src/Verilog/common.mk
+@@ -14,7 +14,8 @@ INSTALL?=install -c
+ RM = rm -f
+
+ PREFIX?=$(TOP)/inst
+-INSTALLDIR=$(PREFIX)/lib/$(INSTALL_NAME)
++LIBDIR?=$(PREFIX)/lib
++INSTALLDIR=$(LIBDIR)/$(INSTALL_NAME)
+
+ .PHONY: all
+ all: test
+diff --git a/src/bluesim/Makefile b/src/bluesim/Makefile
+index 60f2fd9..3e66e5a 100644
+--- a/src/bluesim/Makefile
++++ b/src/bluesim/Makefile
+@@ -4,7 +4,8 @@ TOP:=$(PWD)/../..
+ INSTALL ?= install
+
+ PREFIX?=$(TOP)/inst
+-INSTALLDIR=$(PREFIX)/lib/Bluesim
++LIBDIR?=$(PREFIX)/lib
++INSTALLDIR=$(LIBDIR)/Bluesim
+
+ COMPDIR=$(TOP)/src/comp
+
+diff --git a/src/bluetcl/Makefile b/src/bluetcl/Makefile
+index 80d6050..34d877b 100644
+--- a/src/bluetcl/Makefile
++++ b/src/bluetcl/Makefile
+@@ -2,7 +2,8 @@ PWD:=$(shell pwd)
+ TOP:=$(PWD)/../..
+
+ PREFIX?=$(TOP)/inst
+-INSTALLDIR = $(PREFIX)/lib/tcllib/bluespec
++LIBDIR?=$(PREFIX)/lib
++INSTALLDIR = $(LIBDIR)/tcllib/bluespec
+
+ FILES = \
+ tclIndex \
+diff --git a/src/bluetcl/bluespec.tcl b/src/bluetcl/bluespec.tcl
+index 4ee8e86..e243531 100644
+--- a/src/bluetcl/bluespec.tcl
++++ b/src/bluetcl/bluespec.tcl
+@@ -129,6 +129,7 @@ proc Bluetcl::initBluespec {} {
+ utils::donothing
+ lappend auto_path /usr/share
+ lappend auto_path /usr/lib
++lappend auto_path /usr/lib64
+
+ if { [catch Bluetcl::initBluespec err] } {
+ puts "Error in initialization file bluespec.tcl: $err"
+diff --git a/src/comp/Makefile b/src/comp/Makefile
+index 58b81d7..6f113a2 100644
+--- a/src/comp/Makefile
++++ b/src/comp/Makefile
+@@ -14,6 +14,7 @@ RM = rm -f
+ LN = ln -sf
+
+ FIND = find
++SED = sed
+
+ # -----
+ # Options
+@@ -37,6 +38,7 @@ export NOUPDATEBUILDVERSION
+
+ # PREFIX is where things are installed
+ PREFIX?=$(TOP)/inst
++LIBDIR=$(PREFIX)/lib
+ BINDIR=$(PREFIX)/bin
+
+ # Top-level of where intermediate GHC files are stored
+@@ -389,7 +391,8 @@ $(BINDIR)/core/%: %
+
+ $(BINDIR)/%: wrapper.sh $(BINDIR)/core/%
+ mkdir -p -m 755 $(BINDIR)
+- $(INSTALL) -m 755 wrapper.sh $(BINDIR)/$(@F)
++ $(SED) "s:^LIBDIR=.*$$:LIBDIR=\"$(abspath $(LIBDIR))\":g" wrapper.sh > $(BUILDDIR)/$(@F)
++ $(INSTALL) -m 755 $(BUILDDIR)/$(@F) $(BINDIR)/$(@F)
+
+ .PHONY: install-bsc
+ install-bsc: $(addprefix $(BINDIR)/,$(BSCEXES))
+diff --git a/src/comp/wrapper.sh b/src/comp/wrapper.sh
+index 656e9a0..1d5cf47 100755
+--- a/src/comp/wrapper.sh
++++ b/src/comp/wrapper.sh
+@@ -5,9 +5,23 @@
+ ABSNAME="$(cd "${0%/*}"; echo $PWD)/${0##*/}"
+ SCRIPTNAME="${ABSNAME##*/}"
+ BINDIR="${ABSNAME%/*}"
++# LIBDIR will be replaced to user defined path after build
++LIBDIR="${BINDIR}/../lib"
++
++# If missing LIBDIR, search one.
++# This is unlikely to happen unless the user moves the file after installation.
++if [ ! -d ${LIBDIR} ]; then
++ LIBDIR="$(find ${BINDIR}/.. -maxdepth 10 -type d -name 'SAT' -print -quit)"
++ if [ ! "x${LIBDIR}" = "x" ]; then
++ LIBDIR="${LIBDIR}/.."
++ else
++ echo "Error Bluespec library path not found."
++ exit 1;
++ fi
++fi
+
+ # Set BLUESPECDIR based on the location
+-BLUESPECDIR="$(cd ${BINDIR}/../lib; echo $PWD)"
++BLUESPECDIR="$(cd ${LIBDIR}; echo $PWD)"
+ export BLUESPECDIR
+
+ # Add the dynamically-linked SAT libraries to the load path
+diff --git a/src/exec/Makefile b/src/exec/Makefile
+index 9a16e22..02536cc 100644
+--- a/src/exec/Makefile
++++ b/src/exec/Makefile
+@@ -4,7 +4,8 @@ TOP:=$(PWD)/../..
+ INSTALL?= install
+
+ PREFIX?=$(TOP)/inst
+-INSTALLDIR=$(PREFIX)/lib/exec
++LIBDIR?=$(PREFIX)/lib
++INSTALLDIR=$(LIBDIR)/exec
+
+ .PHONY: install
+ install:
+diff --git a/src/vendor/stp/Makefile b/src/vendor/stp/Makefile
+index 092995d..a520184 100644
+--- a/src/vendor/stp/Makefile
++++ b/src/vendor/stp/Makefile
+@@ -2,6 +2,7 @@ TOP=../../..
+ include $(TOP)/platform.mk
+
+ PREFIX?=$(TOP)/inst
++LIBDIR?=$(PREFIX)/lib
+
+ .PHONY: all install clean full_clean
+
+@@ -22,8 +23,8 @@ all: install
+ install:
+ $(MAKE) -C $(SRC) install
+ ln -fsn HaskellIfc include_hs
+- install -m 755 -d $(PREFIX)/lib/SAT
+- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT
++ install -m 755 -d $(LIBDIR)/SAT
++ install -m 644 lib/$(SNAME) $(LIBDIR)/SAT
+
+ clean:
+ $(MAKE) -C $(SRC) clean
+diff --git a/src/vendor/yices/Makefile b/src/vendor/yices/Makefile
+index b8dbdea..8d4776c 100644
+--- a/src/vendor/yices/Makefile
++++ b/src/vendor/yices/Makefile
+@@ -2,6 +2,7 @@ TOP:=../../..
+ include $(TOP)/platform.mk
+
+ PREFIX?=$(TOP)/inst
++LIBDIR?=$(PREFIX)/lib
+
+ .PHONY: all clean full_clean install
+
+@@ -22,8 +23,8 @@ install:
+ ln -fsn $(VERSION)/include
+ ln -fsn $(VERSION)/lib
+ ln -fsn $(VERSION)/include_hs
+- install -m 755 -d $(PREFIX)/lib/SAT
+- install -m 644 lib/$(SNAME) $(PREFIX)/lib/SAT
++ install -m 755 -d $(LIBDIR)/SAT
++ install -m 644 lib/$(SNAME) $(LIBDIR)/SAT
+
+ clean:
+ $(MAKE) -C $(VERSION) clean
diff --git a/sci-electronics/bsc/files/bsc-9999-fix-wrapper.patch b/sci-electronics/bsc/files/bsc-9999-fix-wrapper.patch
new file mode 100644
index 0000000000..974e428942
--- /dev/null
+++ b/sci-electronics/bsc/files/bsc-9999-fix-wrapper.patch
@@ -0,0 +1,13 @@
+diff --git a/src/comp/Makefile b/src/comp/Makefile
+index 6f113a2..5220c30 100644
+--- a/src/comp/Makefile
++++ b/src/comp/Makefile
+@@ -391,7 +391,7 @@ $(BINDIR)/core/%: %
+
+ $(BINDIR)/%: wrapper.sh $(BINDIR)/core/%
+ mkdir -p -m 755 $(BINDIR)
+- $(SED) "s:^LIBDIR=.*$$:LIBDIR=\"$(abspath $(LIBDIR))\":g" wrapper.sh > $(BUILDDIR)/$(@F)
++ $(SED) "s:^LIBDIR=.*$$:LIBDIR=\"$$\{BINDIR\}/$(shell realpath --relative-to $(BINDIR) $(LIBDIR))\":g" wrapper.sh > $(BUILDDIR)/$(@F)
+ $(INSTALL) -m 755 $(BUILDDIR)/$(@F) $(BINDIR)/$(@F)
+
+ .PHONY: install-bsc
diff --git a/www-apps/jackett-bin/Manifest b/www-apps/jackett-bin/Manifest
index 10e2efd41a..c5eb242d45 100644
--- a/www-apps/jackett-bin/Manifest
+++ b/www-apps/jackett-bin/Manifest
@@ -1,4 +1,3 @@
-DIST jackett-bin-0.17.159.tar.gz 44625042 BLAKE2B 43701f9b05a1fdb0ffffa3294b0ac3aa851dc2120271cd101c6b6a57d66df913383283bf1f83cc1d213c7e990d16c3421681f9a5e7c0545182ffcab5862ad153 SHA512 aa26e391dd033ce35f20c2ae3065240e88ee659fd0ead39392aa3da994025e7f3d4accd29423f646bd22bdf5ac5ca50c4a6d850b55585976a1f0923981696302
DIST jackett-bin-0.17.197-amd64.tar.gz 44622218 BLAKE2B 3426ef363bdb89acccacbf1bfced32066eee80a2ad48cb9875d808735b5c1fa0bf80eb39993bc00190292c1b693a7e210c72d5766f5bc16474fddafa8b3eec5a SHA512 18f585c5047a2c68a9e093f0180f485ed2e2e2a1345b7d503ad24dee369cacce3f8b4bed3bf887b12ad772558910ea5b40e3b46eb12cc30aa217ef2470204cd2
DIST jackett-bin-0.17.197-arm.tar.gz 42499036 BLAKE2B 8a9fac191bdd129003aaa4151f9eb5434567fee5a6dd761f2f993976d8791e9e001817e31053687ab4ae96423b56a702aa892b1fc958c6537f96487801c6e350 SHA512 5410c4a65009b863ba57a1183a2177c3c74d984dfc288691397c741e6b5338aa92582d00384b4b7c5e4fa559e283c3d5ceab695f345c57882d909b132c7b8972
DIST jackett-bin-0.17.197-arm64.tar.gz 41865109 BLAKE2B 11223b268144e082235bf1d88fdbeea74e34efddf187693d8e41c36b2c6b7139f96699683d29d27d19ca7390f018243370e0659288535f07f5a98a6101d90274 SHA512 3215199cce835997772b58a4f3dbde504c10d62f62603e188c5107ee0c9f3c263e7556863adc472f1c7b05c1b837a9328f96cad30c6857a1ef5ed107d2d5ca66
diff --git a/www-apps/jackett-bin/files/jackett.service b/www-apps/jackett-bin/files/jackett.service
new file mode 100644
index 0000000000..b2f2ee870f
--- /dev/null
+++ b/www-apps/jackett-bin/files/jackett.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Jackett Daemon
+After=network.target
+
+[Service]
+SyslogIdentifier=jackett
+Restart=always
+RestartSec=5
+Type=simple
+User=jackett
+Group=jackett
+WorkingDirectory=/var/jackett
+ExecStart=/bin/sh "/opt/jackett/jackett_launcher.sh"
+TimeoutStopSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/jackett-bin/jackett-bin-0.17.159.ebuild b/www-apps/jackett-bin/jackett-bin-0.17.159.ebuild
deleted file mode 100644
index 48d52e30ad..0000000000
--- a/www-apps/jackett-bin/jackett-bin-0.17.159.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="API Support for your favorite torrent trackers"
-HOMEPAGE="https://github.com/Jackett/Jackett"
-SRC_URI="https://github.com/Jackett/Jackett/releases/download/v${PV}/Jackett.Binaries.LinuxAMDx64.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/Jackett
-
-KEYWORDS="~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-RESTRICT="strip"
-
-RDEPEND="
- app-crypt/mit-krb5
- dev-libs/icu
- dev-util/lttng-ust
-"
-
-QA_PRESTRIPPED="/opt/jackett/*"
-QA_PREBUILT="/opt/jackett/*.so"
-
-src_compile(){
- return
-}
-
-src_install() {
- dodir /opt/jackett
- cp -a "${S}"/. "${ED}"/opt/jackett || die
- newinitd "${FILESDIR}"/jackett.initd jackett
- doenvd "${FILESDIR}"/99jackett
-}
diff --git a/www-apps/jackett-bin/jackett-bin-0.17.197.ebuild b/www-apps/jackett-bin/jackett-bin-0.17.197-r1.ebuild
similarity index 93%
rename from www-apps/jackett-bin/jackett-bin-0.17.197.ebuild
rename to www-apps/jackett-bin/jackett-bin-0.17.197-r1.ebuild
index 3e915d390b..b2966ed110 100644
--- a/www-apps/jackett-bin/jackett-bin-0.17.197.ebuild
+++ b/www-apps/jackett-bin/jackett-bin-0.17.197-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit systemd
+
DESCRIPTION="API Support for your favorite torrent trackers"
HOMEPAGE="https://github.com/Jackett/Jackett"
SRC_URI="
@@ -29,5 +31,6 @@ src_install() {
dodir /opt/jackett
cp -a "${S}"/. "${ED}"/opt/jackett || die
newinitd "${FILESDIR}"/jackett.initd jackett
+ systemd_dounit "${FILESDIR}"/jackett.service
doenvd "${FILESDIR}"/99jackett
}
diff --git a/x11-misc/i3lock-color/i3lock-color-9999.ebuild b/x11-misc/i3lock-color/i3lock-color-9999.ebuild
index 964f0a803a..a153448030 100644
--- a/x11-misc/i3lock-color/i3lock-color-9999.ebuild
+++ b/x11-misc/i3lock-color/i3lock-color-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit git-r3
-DESCRIPTION="Improved i3lock with color customization"
+DESCRIPTION="The world's most popular non-default computer lockscreen"
HOMEPAGE="https://github.com/Raymo111/i3lock-color"
EGIT_REPO_URI="https://github.com/Raymo111/i3lock-color.git"