* [gentoo-commits] proj/releng:master commit in: tools-musl/portage.i686.vanilla/, tools-musl/portage.armv7a.hardened/env/, ...
@ 2014-10-18 11:21 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2014-10-18 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 8f397f1a48981ce6d63ffecbb59f4f0d0145ecee
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 18 11:22:15 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct 18 11:22:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=8f397f1a
tools-musl: switch to musl provided libintl
---
tools-musl/portage.amd64.hardened/env/libintl.conf | 2 --
tools-musl/portage.amd64.hardened/env/parallel.conf | 1 -
tools-musl/portage.amd64.hardened/package.accept_keywords | 1 +
tools-musl/portage.amd64.hardened/package.env | 9 ---------
tools-musl/portage.amd64.hardened/package.use | 3 ++-
tools-musl/portage.amd64.vanilla/env/libintl.conf | 2 --
tools-musl/portage.amd64.vanilla/env/parallel.conf | 1 -
tools-musl/portage.amd64.vanilla/package.accept_keywords | 1 +
tools-musl/portage.amd64.vanilla/package.env | 9 ---------
tools-musl/portage.amd64.vanilla/package.use | 3 ++-
tools-musl/portage.armv7a.hardened/env/libintl.conf | 2 --
tools-musl/portage.armv7a.hardened/env/parallel.conf | 1 -
tools-musl/portage.armv7a.hardened/package.accept_keywords | 1 +
tools-musl/portage.armv7a.hardened/package.env | 9 ---------
tools-musl/portage.armv7a.vanilla/env/libintl.conf | 2 --
tools-musl/portage.armv7a.vanilla/env/parallel.conf | 1 -
tools-musl/portage.armv7a.vanilla/package.accept_keywords | 1 +
tools-musl/portage.armv7a.vanilla/package.env | 9 ---------
tools-musl/portage.i686.hardened/env/libintl.conf | 2 --
tools-musl/portage.i686.hardened/env/parallel.conf | 1 -
tools-musl/portage.i686.hardened/package.accept_keywords | 1 +
tools-musl/portage.i686.hardened/package.env | 9 ---------
tools-musl/portage.i686.hardened/package.use | 3 ++-
tools-musl/portage.i686.vanilla/env/libintl.conf | 2 --
tools-musl/portage.i686.vanilla/env/parallel.conf | 1 -
tools-musl/portage.i686.vanilla/package.accept_keywords | 1 +
tools-musl/portage.i686.vanilla/package.env | 9 ---------
tools-musl/portage.i686.vanilla/package.use | 3 ++-
tools-musl/portage.mipsel3.vanilla/env/libintl.conf | 2 --
tools-musl/portage.mipsel3.vanilla/env/parallel.conf | 1 -
tools-musl/portage.mipsel3.vanilla/package.env | 10 ----------
31 files changed, 14 insertions(+), 89 deletions(-)
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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 0000000..2ad2d73
--- /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 3574877..0000000
--- 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 4ef695a..faf6df1 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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 0000000..2ad2d73
--- /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 3574877..0000000
--- 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 4ef695a..faf6df1 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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 0000000..2ad2d73
--- /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 3574877..0000000
--- 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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 0000000..2ad2d73
--- /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 3574877..0000000
--- 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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 0000000..2ad2d73
--- /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 3574877..0000000
--- 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 4ef695a..faf6df1 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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 0000000..2ad2d73
--- /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 3574877..0000000
--- 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 4ef695a..faf6df1 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 06356b5..0000000
--- 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 c67232a..0000000
--- 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 f30fc8b..0000000
--- 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-10-18 11:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-18 11:21 [gentoo-commits] proj/releng:master commit in: tools-musl/portage.i686.vanilla/, tools-musl/portage.armv7a.hardened/env/, Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox