Move from uclibc to glibc.

10 files changed, 5 insertions, 108 deletions

diff --git a/core/etc/portage/env/dev-vcs_git_0 b/core/etc/portage/env/dev-vcs_git_0
deleted file mode 100644
index 50fcbfb..0000000
--- a/core/etc/portage/env/dev-vcs_git_0
+++ /dev/null
@@ -1 +0,0 @@
-LDFLAGS="-liconv"
diff --git a/core/etc/portage/make.conf.CYCLE.1 b/core/etc/portage/make.conf.CYCLE.1
index 312fd6d..b403319 100644
--- a/core/etc/portage/make.conf.CYCLE.1
+++ b/core/etc/portage/make.conf.CYCLE.1
@@ -4,4 +4,7 @@ CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j17"
 PAX_MARKINGS="XT"
 
-USE="-gpg"
+LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavian sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
+
+USE="-cups -tk"
+USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
diff --git a/core/etc/portage/make.conf.CYCLE.2 b/core/etc/portage/make.conf.CYCLE.2
index 2706b1e..74720a7 100644
--- a/core/etc/portage/make.conf.CYCLE.2
+++ b/core/etc/portage/make.conf.CYCLE.2
@@ -3,9 +3,5 @@ CXXFLAGS="${CFLAGS}"
 CHOST="x86_64-gentoo-linux-uclibc"
 MAKEOPTS="-j17"
 PAX_MARKINGS="XT"
-PYTHON_TARGETS="python2_7 python3_4"
 
 LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavian sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
-
-USE="-cups -tk"
-USE_ORDER="env:conf:pkg:defaults:pkginternal:repo:env.d"
diff --git a/core/etc/portage/make.conf.CYCLE.3 b/core/etc/portage/make.conf.CYCLE.3
deleted file mode 100644
index 844a47f..0000000
--- a/core/etc/portage/make.conf.CYCLE.3
+++ /dev/null
@@ -1,8 +0,0 @@
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-gentoo-linux-uclibc"
-MAKEOPTS="-j17"
-PAX_MARKINGS="XT"
-PYTHON_TARGETS="python2_7 python3_4"
-
-LINGUAS="ach af af_ZA ak am an ar ar_JO ar_SA ar_SY as as_IN ast az be be@latin be_BY bg bg_BG bn bn_BD bn_IN bo bo_CN br brx bs byn ca ca@valencia ca_ES ca_XV cmn crh cs cs_CZ csb cy cy_GB da da_DK de de_1901 de_CH de_DE de_FR dgo doi dz ee el el_GR en en@shaw en_AU en_CA en_EN en_GB en_US en_ZA eo eo_UY es es_419 es_AR es_CL es_CO es_CR es_DO es_ES es_LA es_MX es_UY es_VE et et_EE eu eu_ES fa fa_IR fi fi_FI fil fo fr fr_CA fr_FR fy fy_NL ga ga_IE gd gez gl gl_ES gu gu_IN haw he he_IL hi hi_IN hne hr hr_HR hsb ht hu hu_HU hy hy_AM ia id id_ID is is_IS it it_IT ja ja_JP jv ka ka_GE kk kk_KZ km kn kn_IN ko ko_KR kok ks ksw ku ky ky_KG la lb lg li lo lt lt_LT lv lv_LV mai me mg mi mk ml ml_IN mn mni mr mr_IN ms ms_MY mt my my_MM nan nb nb_NO nds ne nl nl_BE nl_NL nn nn_NO no nqo nr ns nso oc om or or_IN pa pa_IN pam pap pl pl_PL ps pt pt_BR pt_PT rm ro ro_RO ru ru_RU ru_RU_0 rue rw sa sa_IN sah sat sco sd se sh sh_YU shn si si_LK sk sk_SK sl sl_SI so son sq sq_AL sr sr@Latn sr@ijekavian sr@ijekavianlatin sr@latin sr_BA sr_BA@latin sr_CS sr_RS sr_RS@cyrillic sr_RS@latin ss st sv sv_SE sw sw_TZ syc ta ta_IN ta_LK te te_IN tg tg_TJ th th_TH ti ti_ER tig tk tl tlh tn tpi tr tr_TR ts tt tt@iqtelif tt_RU ug uk uk_UA ur ur_IN ur_PK uz uz@Cyrl uz@Latn uz@cyrillic uz_UZ ve vi vi_VN wa wal wo xh yi zh zh_CN zh_HK zh_TW zu"
diff --git a/core/etc/portage/make.profile b/core/etc/portage/make.profile
index e40252c..fb4e880 120000
--- a/core/etc/portage/make.profile
+++ b/core/etc/portage/make.profile
@@ -1 +1 @@
-../../usr/portage/profiles/hardened/linux/uclibc/amd64
\ No newline at end of file
+../../usr/portage/profiles/hardened/linux/amd64
\ No newline at end of file
diff --git a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0 b/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
deleted file mode 100644
index 4425c84..0000000
--- a/core/etc/portage/package.accept_keywords/sys-libs_uclibc_0
+++ /dev/null
@@ -1 +0,0 @@
-=sys-libs/uclibc-0.9.33.9999 **
diff --git a/core/etc/portage/package.env b/core/etc/portage/package.env
deleted file mode 100644
index 2ae36b3..0000000
--- a/core/etc/portage/package.env
+++ /dev/null
@@ -1 +0,0 @@
-dev-vcs/git:0 dev-vcs_git_0
diff --git a/core/etc/portage/package.use/sys-libs_uclibc_0 b/core/etc/portage/package.use/sys-libs_uclibc_0
deleted file mode 100644
index 0715d0b..0000000
--- a/core/etc/portage/package.use/sys-libs_uclibc_0
+++ /dev/null
@@ -1 +0,0 @@
-sys-libs/uclibc -* savedconfig
diff --git a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch b/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
deleted file mode 100644
index 5f68c99..0000000
--- a/core/etc/portage/patches/sys-libs/uclibc/98-ldso-libdl-libdl.c-do-not-unmap-libraries.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 579dcdbc8aab966b22f6324a16dbf8fd08a607c3 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Fri, 17 Apr 2015 16:51:43 -0400
-Subject: [PATCH] ldso/libdl/libdl.c: do not unmap libraries.
-
----
- ldso/libdl/libdl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 49711a8..2c43c07 100644
---- a/ldso/libdl/libdl.c
-+++ b/ldso/libdl/libdl.c
-@@ -977,7 +977,7 @@ static int do_dlclose(void *vhandle, int need_fini)
- 
- 			end = (end + ADDR_ALIGN) & PAGE_ALIGN;
- 			start = start & ~ADDR_ALIGN;
--			DL_LIB_UNMAP (tpnt, end - start);
-+			//DL_LIB_UNMAP (tpnt, end - start);
- 			/* Free elements in RTLD_LOCAL scope list */
- 			for (runp = tpnt->rtld_local; runp; runp = tmp) {
- 				tmp = runp->next;
--- 
-2.0.5
-
diff --git a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch b/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
deleted file mode 100644
index 007ec33..0000000
--- a/core/etc/portage/patches/sys-libs/uclibc/99-libc-add-isfdtype.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f22cca4722fa66e424562e69f4afa2bca0af871d Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sun, 28 Jul 2013 09:08:34 -0400
-Subject: [PATCH] libc: add isfdtype()
-
-isfdtype(int fd, int fdtype) check whether a file descriptor fd is
-of type fdtype, where the types are defined in stat(2).  It is
-supported in glibc and BSD, and used by utilities such as acpid.
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- libc/misc/file/isfdtype.c | 40 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 40 insertions(+)
- create mode 100644 libc/misc/file/isfdtype.c
-
-diff --git a/libc/misc/file/isfdtype.c b/libc/misc/file/isfdtype.c
-new file mode 100644
-index 0000000..4d9199b
---- /dev/null
-+++ libc/misc/file/isfdtype.c
-@@ -0,0 +1,40 @@
-+/* Determine whether descriptor has given property.
-+   Copyright (C) 1996-2013 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <errno.h>
-+#include <sys/stat.h>
-+#include <sys/socket.h>
-+#include <sys/types.h>
-+#ifdef __UCLIBC_HAS_LFS__
-+# include <_lfs_64.h>
-+#else
-+# define stat64 stat
-+# define fstat64 fstat
-+#endif
-+
-+int
-+isfdtype (int fildes, int fdtype)
-+{
-+  struct stat64 st;
-+  int save_error = errno;
-+  int result = fstat64 (fildes, &st);
-+  __set_errno (save_error);
-+  if (result)
-+	  return result;
-+  return (st.st_mode & S_IFMT) == (mode_t) fdtype;
-+}
--- 
-1.8.3.2.733.gf8abaeb
-