diff --git a/tools-musl/portage.amd64.hardened/env/libintl.conf b/tools-musl/portage.amd64.hardened/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.amd64.hardened/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.amd64.hardened/env/parallel.conf b/tools-musl/portage.amd64.hardened/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.amd64.hardened/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.amd64.hardened/package.accept_keywords b/tools-musl/portage.amd64.hardened/package.accept_keywords
new file mode 100644
index 00000000..2ad2d733
--- /dev/null
+++ b/tools-musl/portage.amd64.hardened/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gettext-0.19.2 ~amd64 ~arm ~x86
diff --git a/tools-musl/portage.amd64.hardened/package.env b/tools-musl/portage.amd64.hardened/package.env
deleted file mode 100644
index 35748774..00000000
--- a/tools-musl/portage.amd64.hardened/package.env
+++ /dev/null
@@ -1,9 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf
diff --git a/tools-musl/portage.amd64.hardened/package.use b/tools-musl/portage.amd64.hardened/package.use
index 4ef695a6..faf6df11 100644
--- a/tools-musl/portage.amd64.hardened/package.use
+++ b/tools-musl/portage.amd64.hardened/package.use
@@ -1 +1,2 @@
-sys-libs/musl nls
+sys-devel/gettext -nls
+sys-fs/e2fsprogs -nls
diff --git a/tools-musl/portage.amd64.vanilla/env/libintl.conf b/tools-musl/portage.amd64.vanilla/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.amd64.vanilla/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.amd64.vanilla/env/parallel.conf b/tools-musl/portage.amd64.vanilla/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.amd64.vanilla/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.amd64.vanilla/package.accept_keywords b/tools-musl/portage.amd64.vanilla/package.accept_keywords
new file mode 100644
index 00000000..2ad2d733
--- /dev/null
+++ b/tools-musl/portage.amd64.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gettext-0.19.2 ~amd64 ~arm ~x86
diff --git a/tools-musl/portage.amd64.vanilla/package.env b/tools-musl/portage.amd64.vanilla/package.env
deleted file mode 100644
index 35748774..00000000
--- a/tools-musl/portage.amd64.vanilla/package.env
+++ /dev/null
@@ -1,9 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf
diff --git a/tools-musl/portage.amd64.vanilla/package.use b/tools-musl/portage.amd64.vanilla/package.use
index 4ef695a6..faf6df11 100644
--- a/tools-musl/portage.amd64.vanilla/package.use
+++ b/tools-musl/portage.amd64.vanilla/package.use
@@ -1 +1,2 @@
-sys-libs/musl nls
+sys-devel/gettext -nls
+sys-fs/e2fsprogs -nls
diff --git a/tools-musl/portage.armv7a.hardened/env/libintl.conf b/tools-musl/portage.armv7a.hardened/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.armv7a.hardened/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.armv7a.hardened/env/parallel.conf b/tools-musl/portage.armv7a.hardened/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.armv7a.hardened/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.armv7a.hardened/package.accept_keywords b/tools-musl/portage.armv7a.hardened/package.accept_keywords
new file mode 100644
index 00000000..2ad2d733
--- /dev/null
+++ b/tools-musl/portage.armv7a.hardened/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gettext-0.19.2 ~amd64 ~arm ~x86
diff --git a/tools-musl/portage.armv7a.hardened/package.env b/tools-musl/portage.armv7a.hardened/package.env
deleted file mode 100644
index 35748774..00000000
--- a/tools-musl/portage.armv7a.hardened/package.env
+++ /dev/null
@@ -1,9 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf
diff --git a/tools-musl/portage.armv7a.vanilla/env/libintl.conf b/tools-musl/portage.armv7a.vanilla/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.armv7a.vanilla/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.armv7a.vanilla/env/parallel.conf b/tools-musl/portage.armv7a.vanilla/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.armv7a.vanilla/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.armv7a.vanilla/package.accept_keywords b/tools-musl/portage.armv7a.vanilla/package.accept_keywords
new file mode 100644
index 00000000..2ad2d733
--- /dev/null
+++ b/tools-musl/portage.armv7a.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gettext-0.19.2 ~amd64 ~arm ~x86
diff --git a/tools-musl/portage.armv7a.vanilla/package.env b/tools-musl/portage.armv7a.vanilla/package.env
deleted file mode 100644
index 35748774..00000000
--- a/tools-musl/portage.armv7a.vanilla/package.env
+++ /dev/null
@@ -1,9 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf
diff --git a/tools-musl/portage.i686.hardened/env/libintl.conf b/tools-musl/portage.i686.hardened/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.i686.hardened/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.i686.hardened/env/parallel.conf b/tools-musl/portage.i686.hardened/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.i686.hardened/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.i686.hardened/package.accept_keywords b/tools-musl/portage.i686.hardened/package.accept_keywords
new file mode 100644
index 00000000..2ad2d733
--- /dev/null
+++ b/tools-musl/portage.i686.hardened/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gettext-0.19.2 ~amd64 ~arm ~x86
diff --git a/tools-musl/portage.i686.hardened/package.env b/tools-musl/portage.i686.hardened/package.env
deleted file mode 100644
index 35748774..00000000
--- a/tools-musl/portage.i686.hardened/package.env
+++ /dev/null
@@ -1,9 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf
diff --git a/tools-musl/portage.i686.hardened/package.use b/tools-musl/portage.i686.hardened/package.use
index 4ef695a6..faf6df11 100644
--- a/tools-musl/portage.i686.hardened/package.use
+++ b/tools-musl/portage.i686.hardened/package.use
@@ -1 +1,2 @@
-sys-libs/musl nls
+sys-devel/gettext -nls
+sys-fs/e2fsprogs -nls
diff --git a/tools-musl/portage.i686.vanilla/env/libintl.conf b/tools-musl/portage.i686.vanilla/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.i686.vanilla/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.i686.vanilla/env/parallel.conf b/tools-musl/portage.i686.vanilla/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.i686.vanilla/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.i686.vanilla/package.accept_keywords b/tools-musl/portage.i686.vanilla/package.accept_keywords
new file mode 100644
index 00000000..2ad2d733
--- /dev/null
+++ b/tools-musl/portage.i686.vanilla/package.accept_keywords
@@ -0,0 +1 @@
+=sys-devel/gettext-0.19.2 ~amd64 ~arm ~x86
diff --git a/tools-musl/portage.i686.vanilla/package.env b/tools-musl/portage.i686.vanilla/package.env
deleted file mode 100644
index 35748774..00000000
--- a/tools-musl/portage.i686.vanilla/package.env
+++ /dev/null
@@ -1,9 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf
diff --git a/tools-musl/portage.i686.vanilla/package.use b/tools-musl/portage.i686.vanilla/package.use
index 4ef695a6..faf6df11 100644
--- a/tools-musl/portage.i686.vanilla/package.use
+++ b/tools-musl/portage.i686.vanilla/package.use
@@ -1 +1,2 @@
-sys-libs/musl nls
+sys-devel/gettext -nls
+sys-fs/e2fsprogs -nls
diff --git a/tools-musl/portage.mipsel3.vanilla/env/libintl.conf b/tools-musl/portage.mipsel3.vanilla/env/libintl.conf
deleted file mode 100644
index 06356b5d..00000000
--- a/tools-musl/portage.mipsel3.vanilla/env/libintl.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-CFLAGS="-Wl,-lintl"
-LDFLAGS="-lintl"
diff --git a/tools-musl/portage.mipsel3.vanilla/env/parallel.conf b/tools-musl/portage.mipsel3.vanilla/env/parallel.conf
deleted file mode 100644
index c67232a0..00000000
--- a/tools-musl/portage.mipsel3.vanilla/env/parallel.conf
+++ /dev/null
@@ -1 +0,0 @@
-MAKEOPTS=-j1
diff --git a/tools-musl/portage.mipsel3.vanilla/package.env b/tools-musl/portage.mipsel3.vanilla/package.env
deleted file mode 100644
index f30fc8bc..00000000
--- a/tools-musl/portage.mipsel3.vanilla/package.env
+++ /dev/null
@@ -1,10 +0,0 @@
-dev-libs/glib libintl.conf
-dev-libs/libelf libintl.conf
-sys-apps/attr libintl.conf
-sys-apps/kbd libintl.conf
-sys-apps/man-db parallel.conf
-sys-apps/net-tools libintl.conf
-sys-apps/util-linux libintl.conf
-sys-fs/e2fsprogs libintl.conf
-sys-fs/eudev libintl.conf
-sys-process/procps libintl.conf