diff --git a/dev-cpp/vectorwrapper/Manifest b/dev-cpp/vectorwrapper/Manifest
index a932f2e9a4..44828bc28d 100644
--- a/dev-cpp/vectorwrapper/Manifest
+++ b/dev-cpp/vectorwrapper/Manifest
@@ -1 +1 @@
-DIST vectorwrapper-1.1.1.tar.gz 1016401 BLAKE2B bb329e27800dc19537dca009d367b1ab0123c47cb59664bffc7bb4dedaf50a651e6254716bf4113cf7d957c9b10fad461806d2c4a945ac73772964f46de3ac26 SHA512 45ac836a8e0c7e08cd5213926a1711fec8f6d43fa2eb3ac1e9596fdd9c67ad5da96599e982f3acc2ea2e015d493b8454febe5e28a6b491caff35762eab2ed0f8
+DIST vectorwrapper-1.1.2.tar.gz 1018302 BLAKE2B 8cb0ba9d5b5e0c39bf963ccbc399ad3dfdf4157397fb565484d38831c63dd4f69a4d18cf5b28e3b68d5531f783b72fa4c9197a63d385c82e56d7b03a4afec467 SHA512 8484700c02baff9ffd32b080e49892e67a3db38bdddc2b3cd5774b45fa5f68daa6e7892883b4744dbd6f003afec2e6d2354950b309d7fb8e76790d353fe3a4a8
diff --git a/dev-cpp/vectorwrapper/vectorwrapper-1.1.1.ebuild b/dev-cpp/vectorwrapper/vectorwrapper-1.1.2.ebuild
similarity index 95%
rename from dev-cpp/vectorwrapper/vectorwrapper-1.1.1.ebuild
rename to dev-cpp/vectorwrapper/vectorwrapper-1.1.2.ebuild
index 497b5a7710..9c03f349c5 100644
--- a/dev-cpp/vectorwrapper/vectorwrapper-1.1.1.ebuild
+++ b/dev-cpp/vectorwrapper/vectorwrapper-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/dev-scheme/guile-gi/Manifest b/dev-scheme/guile-gi/Manifest
new file mode 100644
index 0000000000..073a4bf2c7
--- /dev/null
+++ b/dev-scheme/guile-gi/Manifest
@@ -0,0 +1 @@
+DIST guile-gi-0.3.1.tar.gz 345440 BLAKE2B 17c4ecda48951244d427098767072621278750614919f13d1b03b7ecda5f06b2274c7db50c4288b4bfe581cd852e80cd1d4137b5ccc0e18d0e23866e1eba323a SHA512 b866df95946069cad606bc8f7e7c988665029482bcb986109d652728023151a5e60ee39e86635b9f0b9f0d4d3a9cd72f39b65ee983438f71dff186994e3af197
diff --git a/dev-scheme/guile-gi/guile-gi-0.3.1.ebuild b/dev-scheme/guile-gi/guile-gi-0.3.1.ebuild
new file mode 100644
index 0000000000..2d70136d48
--- /dev/null
+++ b/dev-scheme/guile-gi/guile-gi-0.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Bindings for GObject Introspection and libgirepository for Guile"
+HOMEPAGE="https://spk121.github.io/guile-gi/"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/spk121/${PN}.git"
+else
+ SRC_URI="https://github.com/spk121/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Tests fail
+RESTRICT="strip test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+ sys-apps/texinfo
+"
+DEPEND="
+ >=dev-scheme/guile-2.0.9
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3[introspection]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+ sh ./bootstrap || die
+
+ local myconf=(
+ --enable-introspection="yes"
+ --enable-hardening
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ mv "${D}/usr/share/doc/${PN}"/* "${D}/usr/share/doc/${PF}" || die
+ rm -r "${D}/usr/share/doc/${PN}" || die
+}
diff --git a/dev-scheme/guile-gi/guile-gi-9999.ebuild b/dev-scheme/guile-gi/guile-gi-9999.ebuild
new file mode 100644
index 0000000000..2d70136d48
--- /dev/null
+++ b/dev-scheme/guile-gi/guile-gi-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Bindings for GObject Introspection and libgirepository for Guile"
+HOMEPAGE="https://spk121.github.io/guile-gi/"
+
+if [[ "${PV}" == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/spk121/${PN}.git"
+else
+ SRC_URI="https://github.com/spk121/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+# Tests fail
+RESTRICT="strip test"
+LICENSE="GPL-3"
+SLOT="0"
+
+BDEPEND="
+ sys-apps/texinfo
+"
+DEPEND="
+ >=dev-scheme/guile-2.0.9
+ dev-libs/gobject-introspection
+ x11-libs/gtk+:3[introspection]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ default
+
+ find "${S}" -name "*.scm" -exec touch {} + || die
+}
+
+src_configure() {
+ sh ./bootstrap || die
+
+ local myconf=(
+ --enable-introspection="yes"
+ --enable-hardening
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ mv "${D}/usr/share/doc/${PN}"/* "${D}/usr/share/doc/${PF}" || die
+ rm -r "${D}/usr/share/doc/${PN}" || die
+}
diff --git a/dev-scheme/guile-gi/metadata.xml b/dev-scheme/guile-gi/metadata.xml
new file mode 100644
index 0000000000..04839c4121
--- /dev/null
+++ b/dev-scheme/guile-gi/metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ xgqt@riseup.net
+ Maciej Barć
+
+
+ This is a library for GNU Guile to create language bindings
+ via GObject Introspection.
+ This is beta code. It is only partially documented. The API is
+ stabilizing, but may still be subject to change.
+ Guile GI has two primary components:
+ - The gi scheme modules: guile modules that provide functionality
+ to dynamically generate Scheme API from GObject typelib files.
+ - libguile-gi.so or libguile-gi.dll: a compiled module that contains
+ glue code to interface with GObject.
+ To create bindings, use the use-typelibs syntax found in
+ the (gi) library.
+
+
+ spk121/guile-gi
+
+
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest
deleted file mode 100644
index 47bb99cfa0..0000000000
--- a/dev-vcs/git-extras/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST git-extras-6.1.0.tar.gz 153503 BLAKE2B 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747 SHA512 098415339177f802299d93947e2979a2fc6c2935eb2d735cd71ad76e035d5489e4c8d9009e2673c109b28e393319745be249cc195814087d59b436f4a56dabab
diff --git a/dev-vcs/git-extras/git-extras-6.1.0.ebuild b/dev-vcs/git-extras/git-extras-6.1.0.ebuild
deleted file mode 100644
index 3ab7c35950..0000000000
--- a/dev-vcs/git-extras/git-extras-6.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Little git extras"
-HOMEPAGE="https://github.com/tj/git-extras"
-
-if [[ "${PV}" == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="${HOMEPAGE}"
-else
- SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-vcs/git"
-
-src_compile() { :; }
-
-src_install() {
- emake install PREFIX="${EPREIFX}"/usr SYSCONFDIR="${EPREFIX}"/etc DESTDIR="${D}"
-
- rm -rf "${D}"/etc/bash_completion.d
-
- newbashcomp etc/bash_completion.sh "${PN}"
-
- insinto /usr/share/zsh/site-functions
- newins etc/git-extras-completion.zsh "_${PN}"
-
-}
diff --git a/dev-vcs/git-extras/git-extras-9999.ebuild b/dev-vcs/git-extras/git-extras-9999.ebuild
deleted file mode 100644
index 3ab7c35950..0000000000
--- a/dev-vcs/git-extras/git-extras-9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Little git extras"
-HOMEPAGE="https://github.com/tj/git-extras"
-
-if [[ "${PV}" == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="${HOMEPAGE}"
-else
- SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-vcs/git"
-
-src_compile() { :; }
-
-src_install() {
- emake install PREFIX="${EPREIFX}"/usr SYSCONFDIR="${EPREFIX}"/etc DESTDIR="${D}"
-
- rm -rf "${D}"/etc/bash_completion.d
-
- newbashcomp etc/bash_completion.sh "${PN}"
-
- insinto /usr/share/zsh/site-functions
- newins etc/git-extras-completion.zsh "_${PN}"
-
-}
diff --git a/dev-vcs/git-extras/metadata.xml b/dev-vcs/git-extras/metadata.xml
deleted file mode 100644
index 87ca0f178b..0000000000
--- a/dev-vcs/git-extras/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- petrus.zy.07@gmail.com
- Petrus Zhao
-
-
- tj/git-extras
-
-