public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2015-10-18 17:03 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2015-10-18 17:03 UTC (permalink / raw
  To: gentoo-commits

commit:     2be2a88e8baeb0d40ae506a91e0d006e351bc989
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 17:08:10 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 17:10:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be2a88e

sys-libs/uclibc: add myself as co-maintainer.

Package-Manager: portage-2.2.20.1

 sys-libs/uclibc/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index e4cf5b8..c616c63 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -6,6 +6,10 @@
     <email>vapier@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
+  <maintainer>
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
   <longdescription>
 uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux 
 systems. It is much smaller than the GNU C Library, but nearly all applications supported 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2016-04-13  0:10 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-04-13  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     dfbc591e232ca10978d22b8c5831321a1e20be4b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 00:15:31 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 00:15:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbc591e

sys-libs/uclibc: block with sys-libs/uclibc-ng

Package-Manager: portage-2.2.26

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 7 ++++++-
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 7 ++++++-
 sys-libs/uclibc/uclibc-9999.ebuild         | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 6c3c0a0..be9d8e6 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,6 +31,11 @@ SLOT="0"
 IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
+# We cannot migrate between uclibc and uclibc-ng because as soon as portage
+# updates the ld.so sym link, the system breaks.  Ideally this should be a
+# hard blocker, but EAPI=0 doesn't allow hard blockers.
+RDEPEND="!sys-libs/uclibc-ng"
+
 S=${WORKDIR}/${MY_P}
 
 is_crosscompile() {

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index a6dd21f..2d30cfe 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -32,6 +32,11 @@ SLOT="0"
 IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
+# We cannot migrate between uclibc and uclibc-ng because as soon as portage
+# updates the ld.so sym link, the system breaks.  Ideally this should be a
+# hard blocker, but EAPI=0 doesn't allow hard blockers.
+RDEPEND="!sys-libs/uclibc-ng"
+
 S=${WORKDIR}/${MY_P}
 
 is_crosscompile() {

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 0d45e83..5e54ad2 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,6 +31,11 @@ SLOT="0"
 IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
 RESTRICT="strip"
 
+# We cannot migrate between uclibc and uclibc-ng because as soon as portage
+# updates the ld.so sym link, the system breaks.  Ideally this should be a
+# hard blocker, but EAPI=0 doesn't allow hard blockers.
+RDEPEND="!sys-libs/uclibc-ng"
+
 S=${WORKDIR}/${MY_P}
 
 is_crosscompile() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2016-04-20  3:58 Mike Frysinger
  0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger @ 2016-04-20  3:58 UTC (permalink / raw
  To: gentoo-commits

commit:     a616cd3ce29bafb533d69861d2ed1af13446e034
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 03:32:51 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 03:57:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a616cd3c

sys-libs/uclibc: move to https:// URLs

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 4 ++--
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 4 ++--
 sys-libs/uclibc/uclibc-9999.ebuild         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index be9d8e6..e0e47bf 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -18,10 +18,10 @@ fi
 
 MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
+HOMEPAGE="https://www.uclibc.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER="17"
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
 		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
 	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
 fi

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index 2d30cfe..cd2d71b 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -19,10 +19,10 @@ fi
 
 MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
+HOMEPAGE="https://www.uclibc.org/"
 if [[ ${PV} != *9999 ]] ; then
 	PATCH_VER=""
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
 		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
 	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
 fi

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 5e54ad2..e9e5193 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -18,10 +18,10 @@ fi
 
 MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="http://www.uclibc.org/"
+HOMEPAGE="https://www.uclibc.org/"
 if [[ ${PV} != "9999" ]] ; then
 	PATCH_VER=""
-	SRC_URI="http://uclibc.org/downloads/${MY_P}.tar.bz2
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
 		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
 	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
 fi


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2016-05-11  2:20 Mike Frysinger
  0 siblings, 0 replies; 10+ messages in thread
From: Mike Frysinger @ 2016-05-11  2:20 UTC (permalink / raw
  To: gentoo-commits

commit:     192950b7031b42573f954f4a52800dcc4b143d22
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed May 11 02:20:10 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed May 11 02:20:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=192950b7

sys-libs/uclibc: enable GNU hash support by default #581686

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 1 +
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 1 +
 sys-libs/uclibc/uclibc-9999.ebuild         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index e0e47bf..626fc8c 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -145,6 +145,7 @@ src_config() {
 	fi
 
 	defs=(
+		LDSO_GNU_HASH_SUPPORT
 		MALLOC_GLIBC_COMPAT
 		DO_C99_MATH
 		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index cd2d71b..a3844ec 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -146,6 +146,7 @@ src_config() {
 	fi
 
 	defs=(
+		LDSO_GNU_HASH_SUPPORT
 		MALLOC_GLIBC_COMPAT
 		DO_C99_MATH
 		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index e9e5193..c44072b 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -145,6 +145,7 @@ src_config() {
 	fi
 
 	defs=(
+		LDSO_GNU_HASH_SUPPORT
 		MALLOC_GLIBC_COMPAT
 		DO_C99_MATH
 		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2016-06-02 23:57 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2016-06-02 23:57 UTC (permalink / raw
  To: gentoo-commits

commit:     633d56fbf4d1e22d4179c378edb16bdb3762ad94
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 23:58:55 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 23:58:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=633d56fb

sys-libs/uclibc: ensable SHA256 and 512 by default, bug #584140

Package-Manager: portage-2.2.28

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 626fc8c..49979af 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -155,6 +155,8 @@ src_config() {
 		UCLIBC_HAS_LIBUTIL
 		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
 		UCLIBC_HAS_RESOLVER_SUPPORT
+		UCLIBC_HAS_SHA256_CRYPT_IMPL
+		UCLIBC_HAS_SHA512_CRYPT_IMPL
 		UCLIBC_HAS_TZ_FILE_READ_MANY
 		UCLIBC_HAS_UTMPX
 		UCLIBC_SUPPORT_AI_ADDRCONFIG


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2017-11-26 23:26 David Seifert
  0 siblings, 0 replies; 10+ messages in thread
From: David Seifert @ 2017-11-26 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     d4faf900f14ccd6a16c39b6fac4c55b3905d7a41
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 13:01:38 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:25:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4faf900

sys-libs/uclibc: [QA] Consistent whitespace in metadata.xml

 sys-libs/uclibc/metadata.xml | 57 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index cd311b1b4b4..9de4d50e5d4 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>vapier@gentoo.org</email>
-    <description>Primary Maintainer</description>
-  </maintainer>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>embedded@gentoo.org</email>
-    <name>Embedded Gentoo</name>
-  </maintainer>
-  <longdescription>
-uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux 
-systems. It is much smaller than the GNU C Library, but nearly all applications supported 
-by glibc also work perfectly with uClibc. Porting applications from glibc to uClibc 
-typically involves just recompiling the source code. uClibc even supports shared libraries 
-and threading. It currently runs on standard Linux and MMU-less (also known as uClinux) 
-systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel, PowerPC, 
-SH, SPARC, and v850 processors.
-</longdescription>
-<use>
-	<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
-	<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
-	<flag name="savedconfig">Adds support for user defined configs</flag>
-	<flag name="uclibc-compat">Build uclibc with backwards compatible
-		options</flag>
-	<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
-</use>
+	<maintainer type="person">
+		<email>vapier@gentoo.org</email>
+		<description>Primary Maintainer</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<longdescription>
+		uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux
+		systems. It is much smaller than the GNU C Library, but nearly all applications supported
+		by glibc also work perfectly with uClibc. Porting applications from glibc to uClibc
+		typically involves just recompiling the source code. uClibc even supports shared libraries
+		and threading. It currently runs on standard Linux and MMU-less (also known as uClinux)
+		systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel, PowerPC,
+		SH, SPARC, and v850 processors.
+	</longdescription>
+	<use>
+		<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
+		<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
+		<flag name="savedconfig">Adds support for user defined configs</flag>
+		<flag name="uclibc-compat">Build uclibc with backwards compatible options</flag>
+		<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2018-01-07 19:39 Sergei Trofimovich
  0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich @ 2018-01-07 19:39 UTC (permalink / raw
  To: gentoo-commits

commit:     113d629bf4c2b5d01907f93899a32d26956e0855
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 18:41:28 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 19:39:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=113d629b

sys-libs/uclibc: Migrate CROSSCOMPILE_OPTS=headers-only -> USE=headers-only

CROSSCOMPILE_OPTS is a USE_EXPAND of a single item: headers-only.
Convert it to a global USE flag instead.

Mechanical ebuild rename done as:
    $ sed -e 's@crosscompile_opts_headers-only@headers-only@g' \
        -i $(git grep -l headers-only)

'headers-only' flag is used by crossdev to bootstrap stage1 compiler
before libc is available.

crossdev switched to USE=headers-only in =sys-devel/crossdev-20171230.

Bug: https://bugs.gentoo.org/642712
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 6 +++---
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 6 +++---
 sys-libs/uclibc/uclibc-9999.ebuild         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 2702793af65..32bb5418085 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
@@ -27,7 +27,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
 RESTRICT="strip"
 
 # We cannot migrate between uclibc and uclibc-ng because as soon as portage
@@ -49,7 +49,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index 82d3a46528c..fbc8a60a1fc 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
@@ -28,7 +28,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
 RESTRICT="strip"
 
 # We cannot migrate between uclibc and uclibc-ng because as soon as portage
@@ -50,7 +50,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index fb29176b32f..f5cec3749e7 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
@@ -27,7 +27,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp crosscompile_opts_headers-only"
+IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
 RESTRICT="strip"
 
 # We cannot migrate between uclibc and uclibc-ng because as soon as portage
@@ -49,7 +49,7 @@ alt_build_kprefix() {
 }
 
 just_headers() {
-	use crosscompile_opts_headers-only && is_crosscompile
+	use headers-only && is_crosscompile
 }
 
 uclibc_endian() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2018-04-27 22:11 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2018-04-27 22:11 UTC (permalink / raw
  To: gentoo-commits

commit:     bf60ab922b7e43493ea72a47a2f1095e24f86440
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 27 17:38:46 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 22:11:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf60ab92

sys-libs/uclibc: git-2->git-r3, explicit EAPI=0

Also unified the live vs versioned ebuild logic.

Package-Manager: Portage-2.3.31, Repoman-2.3.9
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 27 +++++++++++++++------------
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 26 ++++++++++++++------------
 sys-libs/uclibc/uclibc-9999.ebuild         | 26 ++++++++++++++------------
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 32bb5418085..4c712c8a69a 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,10 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
+
+MY_P=uClibc-${PV}
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.busybox.net/uClibc"
+	EGIT_BRANCH="0.9.33"
+	inherit git-r3
+else
+	PATCH_VER="17"
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -15,15 +25,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="17"
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -232,8 +235,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
 	else
 		unpack ${A}
 	fi

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index fbc8a60a1fc..d55f0afff6d 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,11 +1,20 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == *9999 ]] ; then
+
+MY_P=uClibc-${PV}
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.busybox.net/uClibc"
 	EGIT_BRANCH="0.9.33"
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
+	inherit git-r3
+else
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -16,15 +25,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != *9999 ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -231,8 +233,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-2_src_unpack
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
 	else
 		unpack ${A}
 	fi

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index f5cec3749e7..3e096317bab 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,10 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
+
+MY_P=uClibc-${PV}
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://git.busybox.net/uClibc"
+	inherit git-r3
+else
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -15,15 +24,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -230,8 +232,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
+	if [[ ${PV} == *9999* ]] ; then
+		git-r3_src_unpack
 	else
 		unpack ${A}
 	fi


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2018-06-13  8:05 Michał Górny
  0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2018-06-13  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     778a215f6677b69f7a1d76e1bc664c30d108fd00
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 08:03:32 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 08:05:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778a215f

sys-libs/uclibc: Revert "git-2->git-r3, explicit EAPI=0"

This change blocks prior patch removing EAPI=0 support from git-r3.
If you really want to keep this live ebuild, please update it to use
newer EAPI.  Otherwise, removing it would be a better solution.

 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 27 ++++++++++++---------------
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 26 ++++++++++++--------------
 sys-libs/uclibc/uclibc-9999.ebuild         | 26 ++++++++++++--------------
 3 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
index 4c712c8a69a..32bb5418085 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
@@ -1,20 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.busybox.net/uClibc"
-	EGIT_BRANCH="0.9.33"
-	inherit git-r3
-else
-	PATCH_VER="17"
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.busybox.net/uClibc"
+	inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER="17"
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -235,8 +232,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
index d55f0afff6d..fbc8a60a1fc 100644
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
@@ -1,20 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.busybox.net/uClibc"
+if [[ ${PV} == *9999 ]] ; then
 	EGIT_BRANCH="0.9.33"
-	inherit git-r3
-else
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+	EGIT_REPO_URI="git://git.busybox.net/uClibc"
+	inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -25,8 +16,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != *9999 ]] ; then
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -233,8 +231,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
+	if [[ ${PV} == *9999 ]] ; then
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index 3e096317bab..f5cec3749e7 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,19 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-
-MY_P=uClibc-${PV}
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://git.busybox.net/uClibc"
-	inherit git-r3
-else
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.busybox.net/uClibc"
+	inherit git-2
 fi
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -24,8 +15,15 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
+MY_P=uClibc-${PV}
 DESCRIPTION="C library for developing embedded Linux systems"
 HOMEPAGE="https://www.uclibc.org/"
+if [[ ${PV} != "9999" ]] ; then
+	PATCH_VER=""
+	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
+		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
+	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -232,8 +230,8 @@ src_config() {
 }
 
 src_unpack() {
-	if [[ ${PV} == *9999* ]] ; then
-		git-r3_src_unpack
+	if [[ ${PV} == "9999" ]] ; then
+		git-2_src_unpack
 	else
 		unpack ${A}
 	fi


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/
@ 2018-10-14 12:03 Anthony G. Basile
  0 siblings, 0 replies; 10+ messages in thread
From: Anthony G. Basile @ 2018-10-14 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     a311268af50644d4f15372d550c51e5f435b79b6
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 11:59:08 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 12:02:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a311268a

sys-libs/uclibc: final cleanup from tree

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-libs/uclibc/Manifest                   |   2 -
 sys-libs/uclibc/metadata.xml               |  28 ---
 sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild | 355 -----------------------------
 sys-libs/uclibc/uclibc-0.9.33.9999.ebuild  | 354 ----------------------------
 sys-libs/uclibc/uclibc-9999.ebuild         | 353 ----------------------------
 5 files changed, 1092 deletions(-)

diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
deleted file mode 100644
index ccabd90f584..00000000000
--- a/sys-libs/uclibc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST uClibc-0.9.33.2-patches-17.tar.bz2 32437 BLAKE2B c051e8acf4f7d8da219918a5cd7b465865da7e64307b2a1c64b6b86f8381340edf03745301f0b3b358403d56712964c3d57f330b88a3e8ff2da22d898a35c909 SHA512 6a6ad8aef862f742e60965c447e5abee2349886f01bf5e44111b2a6c21e59e4644195cf36e85b8ce0dabbf7b92dc2c36ae27f0b7a02b0f9f4278e46ec5fb5a76
-DIST uClibc-0.9.33.2.tar.bz2 2834029 BLAKE2B a23e7b3a1a8142ef08349179e27f2d47765757829c2a88d4937d02314bc7c07bd36a21d815213f1478b24075bb029112738161bb1be383df08cec5e786aae260 SHA512 1cf18fe5418e12ae12ce995d7455d465bc4737f225afc49512ec69858771e099bead7b18408b01c7e6f845dcc80c3b4f875332eeffdcc04ae4b48474fb29a8dd

diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
deleted file mode 100644
index d5ebc1b71d8..00000000000
--- a/sys-libs/uclibc/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>embedded@gentoo.org</email>
-		<name>Embedded Gentoo</name>
-	</maintainer>
-	<longdescription>
-		uClibc pronounced yew-see-lib-see is a C library for developing embedded Linux
-		systems. It is much smaller than the GNU C Library, but nearly all applications supported
-		by glibc also work perfectly with uClibc. Porting applications from glibc to uClibc
-		typically involves just recompiling the source code. uClibc even supports shared libraries
-		and threading. It currently runs on standard Linux and MMU-less (also known as uClinux)
-		systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel, PowerPC,
-		SH, SPARC, and v850 processors.
-	</longdescription>
-	<use>
-		<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
-		<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
-		<flag name="savedconfig">Adds support for user defined configs</flag>
-		<flag name="uclibc-compat">Build uclibc with backwards compatible options</flag>
-		<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
-	</use>
-</pkgmetadata>

diff --git a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild b/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
deleted file mode 100644
index 32bb5418085..00000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.2-r15.ebuild
+++ /dev/null
@@ -1,355 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER="17"
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* amd64 arm m68k ~mips ppc sh sparc x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
-RESTRICT="strip"
-
-# We cannot migrate between uclibc and uclibc-ng because as soon as portage
-# updates the ld.so sym link, the system breaks.  Ideally this should be a
-# hard blocker, but EAPI=0 doesn't allow hard blockers.
-RDEPEND="!sys-libs/uclibc-ng"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		LDSO_GNU_HASH_SUPPORT
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_SHA256_CRYPT_IMPL
-		UCLIBC_HAS_SHA512_CRYPT_IMPL
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}

diff --git a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild b/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
deleted file mode 100644
index fbc8a60a1fc..00000000000
--- a/sys-libs/uclibc/uclibc-0.9.33.9999.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_BRANCH="0.9.33"
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != *9999 ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
-RESTRICT="strip"
-
-# We cannot migrate between uclibc and uclibc-ng because as soon as portage
-# updates the ld.so sym link, the system breaks.  Ideally this should be a
-# hard blocker, but EAPI=0 doesn't allow hard blockers.
-RDEPEND="!sys-libs/uclibc-ng"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		LDSO_GNU_HASH_SUPPORT
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}

diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
deleted file mode 100644
index f5cec3749e7..00000000000
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.busybox.net/uClibc"
-	inherit git-2
-fi
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-MY_P=uClibc-${PV}
-DESCRIPTION="C library for developing embedded Linux systems"
-HOMEPAGE="https://www.uclibc.org/"
-if [[ ${PV} != "9999" ]] ; then
-	PATCH_VER=""
-	SRC_URI="https://uclibc.org/downloads/${MY_P}.tar.bz2
-		${PATCH_VER:+mirror://gentoo/${MY_P}-patches-${PATCH_VER}.tar.bz2}"
-	KEYWORDS="-* ~amd64 ~arm ~m68k ~mips ~ppc ~sh ~sparc ~x86"
-fi
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug hardened iconv ipv6 nptl rpc ssp uclibc-compat wordexp headers-only"
-RESTRICT="strip"
-
-# We cannot migrate between uclibc and uclibc-ng because as soon as portage
-# updates the ld.so sym link, the system breaks.  Ideally this should be a
-# hard blocker, but EAPI=0 doesn't allow hard blockers.
-RDEPEND="!sys-libs/uclibc-ng"
-
-S=${WORKDIR}/${MY_P}
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-alt_build_kprefix() {
-	if [[ ${CBUILD} == ${CHOST} && ${CTARGET} == ${CHOST} ]] ; then
-		echo /usr/include
-	else
-		echo /usr/${CTARGET}/usr/include
-	fi
-}
-
-just_headers() {
-	use headers-only && is_crosscompile
-}
-
-uclibc_endian() {
-	# XXX: this wont work for a toolchain which is bi-endian, but we
-	#      dont have any such thing at the moment, so not a big deal
-	touch "${T}"/endian.s
-	$(tc-getAS ${CTARGET}) "${T}"/endian.s -o "${T}"/endian.o
-	case $(file "${T}"/endian.o) in
-		*" MSB "*) echo "BIG";;
-		*" LSB "*) echo "LITTLE";;
-		*)         echo "NFC";;
-	esac
-	rm -f "${T}"/endian.{s,o}
-}
-
-pkg_setup() {
-	if [ ${CTARGET} = ${CHOST} ] ; then
-		case ${CHOST} in
-		*-uclinux*|*-uclibc*) ;;
-		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
-		esac
-	fi
-}
-
-check_cpu_opts() {
-	case ${CTARGET} in
-	# Need to handle $ABI here w/mips.
-	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
-	# XXX: Should figure out how to handle sparc.
-	esac
-
-	if use nptl ; then
-		case ${CTARGET} in
-		i386*)
-			die "Your target has no support for NPTL"
-			;;
-		esac
-	fi
-}
-
-kconfig_q_opt() {
-	local flag=$1; shift
-	case ${flag} in
-	y|n) ;;
-	*) flag=$(usex ${flag} y n) ;;
-	esac
-
-	local var="defs_${flag}"
-	eval "${var}+=( $* )"
-}
-
-get_opt() {
-	(
-	unset ${1}
-	. ${2:-"${S}"/.config}
-	echo ${!1}
-	)
-}
-
-src_oldconfig() {
-	yes "" 2>/dev/null | emake -s oldconfig >/dev/null
-}
-src_config() {
-	restore_config .config
-	if [ -f .config ]; then
-		src_oldconfig
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	emake ARCH=${target} defconfig >/dev/null || die
-
-	local defs_{y,n} defs
-
-	defs=(
-		DO{DEBUG_PT,ASSERTS}
-		SUPPORT_LD_DEBUG_EARLY
-		UCLIBC_HAS_PROFILING
-	)
-	kconfig_q_opt n "${defs[@]}"
-	kconfig_q_opt debug DODEBUG SUPPORT_LD_DEBUG
-
-	sed -i -e '/ARCH_.*_ENDIAN/d' .config
-	kconfig_q_opt y "ARCH_WANTS_$(uclibc_endian)_ENDIAN"
-
-	if [[ ${CTARGET} == arm* ]] ; then
-		kconfig_q_opt n CONFIG_ARM_OABI
-		kconfig_q_opt y CONFIG_ARM_EABI
-	fi
-
-	defs=(
-		LDSO_GNU_HASH_SUPPORT
-		MALLOC_GLIBC_COMPAT
-		DO_C99_MATH
-		UCLIBC_HAS_{CTYPE_CHECKED,WCHAR,HEXADECIMAL_FLOATS,GLIBC_CUSTOM_PRINTF,FOPEN_EXCLUSIVE_MODE,GLIBC_CUSTOM_STREAMS,PRINTF_M_SPEC}
-		UCLIBC_HAS_FENV
-		UCLIBC_HAS_{N,}FTW
-		UCLIBC_HAS_GNU_GLOB
-		UCLIBC_HAS_LIBUTIL
-		UCLIBC_HAS_PROGRAM_INVOCATION_NAME
-		UCLIBC_HAS_RESOLVER_SUPPORT
-		UCLIBC_HAS_TZ_FILE_READ_MANY
-		UCLIBC_HAS_UTMPX
-		UCLIBC_SUPPORT_AI_ADDRCONFIG
-		UCLIBC_SUSV3_LEGACY
-		UCLIBC_SUSV3_LEGACY_MACROS
-		UCLIBC_SUSV4_LEGACY
-		UCLIBC_USE_NETLINK
-		PTHREADS_DEBUG_SUPPORT
-	)
-	kconfig_q_opt y "${defs[@]}"
-	kconfig_q_opt n UCLIBC_HAS_CTYPE_UNSAFE
-	kconfig_q_opt n UCLIBC_HAS_LOCALE
-	kconfig_q_opt n HAS_NO_THREADS
-	kconfig_q_opt ipv6 UCLIBC_HAS_IPV6
-	kconfig_q_opt nptl UCLIBC_HAS_THREADS_NATIVE
-	kconfig_q_opt !nptl LINUXTHREADS_OLD
-	kconfig_q_opt rpc UCLIBC_HAS_{,{FULL,REENTRANT}_}RPC
-	kconfig_q_opt wordexp UCLIBC_HAS_WORDEXP
-	kconfig_q_opt uclibc-compat UCLIBC_HAS_LIB{NSL,RESOLV}_STUB COMPAT_ATEXIT
-
-	# we need to do it independently of hardened to get ssp.c built into libc
-	kconfig_q_opt y UCLIBC_HAS_SSP
-	kconfig_q_opt n UCLIBC_HAS_SSP_COMPAT
-	kconfig_q_opt y UCLIBC_HAS_ARC4RANDOM
-	kconfig_q_opt n PROPOLICE_BLOCK_ABRT
-	kconfig_q_opt y PROPOLICE_BLOCK_SEGV
-
-	# arm/mips do not emit PT_GNU_STACK, but if we enable this here
-	# it will be emitted as RWE, ppc has to be checked, x86 needs it
-	# this option should be used independently of hardened
-	if has $(tc-arch) x86 || has $(tc-arch) ppc ; then
-		kconfig_q_opt y UCLIBC_BUILD_NOEXECSTACK
-	else
-		kconfig_q_opt n UCLIBC_BUILD_NOEXECSTACK
-	fi
-	kconfig_q_opt y UCLIBC_BUILD_RELRO
-	kconfig_q_opt hardened UCLIBC_BUILD_PIE
-	kconfig_q_opt hardened UCLIBC_BUILD_NOW
-	kconfig_q_opt !ssp SSP_QUICK_CANARY
-	kconfig_q_opt ssp UCLIBC_BUILD_SSP
-
-	local def
-	for def in 1 2 ; do
-		# Run twice as some config opts depend on others being enabled first.
-		for def in ${defs_y[@]} ; do
-			sed -i -e "s:.*\<${def}\>.*set:${def}=y:g" .config
-		done
-		for def in ${defs_n[@]} ; do
-			sed -i -e "s:${def}=y:# ${def} is not set:g" .config
-		done
-		src_oldconfig
-	done
-
-	einfo "Enabled options:"
-	for def in ${defs_y[@]} ; do
-		einfo " " $(grep "^${def}=y" .config || echo "could not find ${def}")
-	done
-	einfo "Disabled options:"
-	for def in ${defs_n[@]} ; do
-		einfo " " $(grep "^# ${def} is not set" .config || echo "could not find ${def}")
-	done
-
-	# setup build and run paths
-	sed -i \
-		-e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CTARGET}-\":" \
-		-e "/^KERNEL_HEADERS/s:=.*:=\"$(alt_build_kprefix)\":" \
-		-e "/^SHARED_LIB_LOADER_PREFIX/s:=.*:=\"/$(get_libdir)\":" \
-		-e "/^DEVEL_PREFIX/s:=.*:=\"/usr\":" \
-		-e "/^RUNTIME_PREFIX/s:=.*:=\"/\":" \
-		-e "/^UCLIBC_EXTRA_CFLAGS/s:=.*:=\"${UCLIBC_EXTRA_CFLAGS}\":" \
-		.config || die
-
-	src_oldconfig
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-	cd "${S}"
-	if [[ -n ${PATCH_VER} ]] ; then
-		EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-	fi
-
-	epatch_user
-
-	check_cpu_opts
-
-	echo
-	einfo "Runtime Prefix: /"
-	einfo "Devel Prefix:   /usr"
-	einfo "Kernel Prefix:  $(alt_build_kprefix)"
-	einfo "CBUILD:         ${CBUILD}"
-	einfo "CHOST:          ${CHOST}"
-	einfo "CTARGET:        ${CTARGET}"
-	einfo "CPU:            ${UCLIBC_CPU:-default}"
-	einfo "ENDIAN:         $(uclibc_endian)"
-	echo
-
-	########## CPU SELECTION ##########
-
-	local target=$(tc-arch) config_target
-	case ${target} in
-	amd64) target="x86_64";;
-	arm)   target="arm";     config_target="GENERIC_ARM";;
-	avr)   target="avr32";;
-	mips)  target="mips";    config_target="MIPS_ISA_1";;
-	ppc)   target="powerpc";;
-	sh)    target="sh";      config_target="SH4";;
-	x86)   target="i386";    config_target="486";;
-	esac
-	if [[ -n ${config_target} ]] ; then
-		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-			extra/Configs/Config.${target} || die
-	fi
-	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
-
-	src_config
-
-	if use iconv ; then
-		# Run after make clean, otherwise files removed
-		find ./extra/locale/charmaps -name "*.pairs" > extra/locale/codesets.txt
-		if [[ ! -f /etc/locale.gen ]] ; then
-			# See ./extra/locale/LOCALES for examples
-			die "Please create an appropriate /etc/locale.gen for locale support"
-		fi
-		echo -e "@euro e\n@cyrillic c\n#---\nUTF-8 yes\n8-BIT yes\n#---\n\n" > ./extra/locale/locales.txt
-		cat /etc/locale.gen >> ./extra/locale/locales.txt
-	fi
-}
-
-src_compile() {
-	emake headers || die
-	just_headers && return 0
-
-	emake || die
-	if is_crosscompile ; then
-		emake -C utils hostutils || die
-	else
-		emake utils || die
-	fi
-}
-
-src_test() {
-	is_crosscompile && return 0
-
-	# assert test fails on pax/grsec enabled kernels - normal
-	# vfork test fails in sandbox (both glibc/uclibc)
-	emake UCLIBC_ONLY=1 check || die
-}
-
-src_install() {
-	local sysroot=${D}
-	is_crosscompile && sysroot+="/usr/${CTARGET}"
-
-	local target="install"
-	just_headers && target="install_headers"
-	emake DESTDIR="${sysroot}" ${target} || die
-
-	save_config .config
-
-	# remove files coming from kernel-headers
-	rm -rf "${sysroot}"/usr/include/{linux,asm*}
-
-	# Make sure we install the sys-include symlink so that when
-	# we build a 2nd stage cross-compiler, gcc finds the target
-	# system headers correctly.  See gcc/doc/gccinstall.info
-	if is_crosscompile ; then
-		dosym usr/include /usr/${CTARGET}/sys-include
-		if ! just_headers && [[ -n $(get_opt HAVE_SHARED) ]] ; then
-			newbin utils/ldconfig.host ${CTARGET}-ldconfig || die
-			newbin utils/ldd.host ${CTARGET}-ldd || die
-		fi
-		return 0
-	fi
-
-	emake DESTDIR="${D}" install_utils || die
-	dobin extra/scripts/getent
-	dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3
-}
-
-pkg_postinst() {
-	is_crosscompile && return 0
-
-	if [ ! -e "${ROOT}"/etc/TZ ] ; then
-		ewarn "Please remember to set your timezone in /etc/TZ"
-		mkdir -p "${ROOT}"/etc
-		echo "UTC" > "${ROOT}"/etc/TZ
-	fi
-	[ "${ROOT}" != "/" ] && return 0
-	# update cache before reloading init
-	ldconfig
-	# reload init ...
-	/sbin/telinit U 2>/dev/null
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-10-14 12:03 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-13  0:10 [gentoo-commits] repo/gentoo:master commit in: sys-libs/uclibc/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2018-10-14 12:03 Anthony G. Basile
2018-06-13  8:05 Michał Górny
2018-04-27 22:11 Anthony G. Basile
2018-01-07 19:39 Sergei Trofimovich
2017-11-26 23:26 David Seifert
2016-06-02 23:57 Anthony G. Basile
2016-05-11  2:20 Mike Frysinger
2016-04-20  3:58 Mike Frysinger
2015-10-18 17:03 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