[gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

To make forward progress on bug 417451, introduce a new sep-usr eclass
that will hold all logic related to having a separate /usr.  For now,
this is just the gen_usr_ldscript function and a new USE=sep-usr flag.

All ebuilds that call gen_usr_ldscript today will migrate to this and
will allow people to move away from installing things into /.  For the
systems that want to have a split-/usr partition, they can turn on this
USE flag across their system.

This also allows us to mask the flag on many targets where it doesn't
make sense (like most prefix setups) and where we don't want to support
it at all.

Mike Frysinger (21):
  sep-usr.eclass: new eclass to hold gen_usr_ldscript and related logic
    #417451
  profiles: mask USE=sep-usr for most systems
  sys-libs/zlib: switch to sep-usr eclass
  sys-libs/pwdb: switch to sep-usr eclass
  sys-libs/gpm: switch to sep-usr eclass
  app-arch/bzip2: switch to sep-usr eclass
  app-arch/xz-utils: switch to sep-usr eclass
  sys-apps/acl: switch to sep-usr eclass
  sys-apps/attr: switch to sep-usr eclass
  sys-libs/pam: switch to sep-usr eclass
  dev-libs/lzo: switch to sep-usr eclass
  sys-libs/readline: switch to sep-usr eclass
  sys-apps/keyutils: switch to sep-usr eclass
  dev-libs/libaio: switch to sep-usr eclass
  sys-libs/libcap: switch to sep-usr eclass
  sys-libs/cracklib: switch to sep-usr eclass
  sys-libs/ncurses: switch to sep-usr eclass
  dev-libs/libpwquality: switch to sep-usr eclass
  dev-libs/libedit: switch to sep-usr eclass
  dev-libs/libpcre: switch to sep-usr eclass
  sys-apps/tcp-wrappers: switch to sep-usr eclass

 app-arch/bzip2/bzip2-1.0.6-r6.ebuild               |   2 +-
 app-arch/bzip2/bzip2-1.0.6-r7.ebuild               |   2 +-
 app-arch/xz-utils/xz-utils-5.2.2.ebuild            |   2 +-
 app-arch/xz-utils/xz-utils-9999.ebuild             |   2 +-
 dev-libs/libaio/libaio-0.3.110.ebuild              |   2 +-
 dev-libs/libedit/libedit-20130712.3.1.ebuild       |   4 +-
 dev-libs/libpcre/libpcre-8.38.ebuild               |  10 +-
 dev-libs/libpwquality/libpwquality-1.3.0.ebuild    |  12 +-
 dev-libs/lzo/lzo-2.08-r1.ebuild                    |   2 +-
 dev-libs/lzo/lzo-2.09.ebuild                       |   2 +-
 eclass/sep-usr.eclass                              | 152 +++++++++++++++++++++
 profiles/base/use.mask                             |   3 +
 profiles/default/bsd/use.mask                      |   4 +
 profiles/default/linux/use.mask                    |   4 +
 profiles/prefix/darwin/use.mask                    |   4 +
 profiles/use.desc                                  |   1 +
 sys-apps/acl/acl-2.2.52-r1.ebuild                  |   4 +-
 sys-apps/attr/attr-2.4.47-r2.ebuild                |   2 +-
 sys-apps/keyutils/keyutils-1.5.9-r1.ebuild         |   2 +-
 .../tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild     |   2 +-
 sys-libs/cracklib/cracklib-2.9.1-r1.ebuild         |   4 +-
 sys-libs/cracklib/cracklib-2.9.4.ebuild            |   4 +-
 sys-libs/cracklib/cracklib-2.9.5.ebuild            |   4 +-
 sys-libs/cracklib/cracklib-2.9.6.ebuild            |   4 +-
 sys-libs/gpm/gpm-1.20.7-r2.ebuild                  |   2 +-
 sys-libs/libcap/libcap-2.24-r2.ebuild              |   4 +-
 sys-libs/libcap/libcap-2.25.ebuild                 |   4 +-
 sys-libs/ncurses/ncurses-5.9-r101.ebuild           |   4 +-
 sys-libs/ncurses/ncurses-5.9-r3.ebuild             |   4 +-
 sys-libs/ncurses/ncurses-5.9-r4.ebuild             |   4 +-
 sys-libs/ncurses/ncurses-5.9-r5.ebuild             |   4 +-
 sys-libs/ncurses/ncurses-5.9-r99.ebuild            |   4 +-
 sys-libs/ncurses/ncurses-6.0-r1.ebuild             |   4 +-
 sys-libs/ncurses/ncurses-6.0.ebuild                |   4 +-
 sys-libs/pam/pam-1.2.1-r1.ebuild                   |   4 +-
 sys-libs/pam/pam-1.2.1.ebuild                      |   4 +-
 sys-libs/pwdb/pwdb-0.62.ebuild                     |   2 +-
 sys-libs/readline/readline-6.2_p5-r1.ebuild        |   2 +-
 sys-libs/readline/readline-6.3_p8-r1.ebuild        |   2 +-
 sys-libs/readline/readline-6.3_p8-r2.ebuild        |   2 +-
 sys-libs/readline/readline-7.0_rc1.ebuild          |   2 +-
 sys-libs/zlib/zlib-1.2.8-r1.ebuild                 |   2 +-
 42 files changed, 227 insertions(+), 65 deletions(-)
 create mode 100644 eclass/sep-usr.eclass

-- 
2.7.4

[gentoo-dev] [PATCH 01/21] sep-usr.eclass: new eclass to hold gen_usr_ldscript and related logic #417451

[Mike Frysinger]

This is mostly a copy of the func as it exists in the toolchain-funcs
eclass, but with some of the initial logic shifted to USE=sep-usr.
Once all ebuilds have switched over to this eclass, we can drop it
from the toolchain-funcs eclass.  In the meantime, make sure this is
inherited last.
---
 eclass/sep-usr.eclass | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
 profiles/use.desc     |   1 +
 2 files changed, 153 insertions(+)
 create mode 100644 eclass/sep-usr.eclass

diff --git a/eclass/sep-usr.eclass b/eclass/sep-usr.eclass
new file mode 100644
index 0000000..c6791e1
--- /dev/null
+++ b/eclass/sep-usr.eclass
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# @ECLASS: sep-usr.eclass
+# @MAINTAINER:
+# Toolchain Ninjas <toolchain@gentoo.org>
+# @BLURB: functions to support a split /usr partition
+# @DESCRIPTION:
+# Some core packages might install extra files into / instead of /usr when
+# the expectation is that /usr is a separate mount point.  This eclass holds
+# various functions to simplify that process for ebuild writers.
+
+if [[ -z ${_SEP_USR_ECLASS} ]]; then
+_SEP_USR_ECLASS=1
+
+inherit multilib
+
+IUSE="sep-usr"
+
+# @FUNCTION: gen_usr_ldscript
+# @USAGE: [-a] <list of libs to create linker scripts for>
+# @DESCRIPTION:
+# This function generate linker scripts in /usr/lib for dynamic
+# libs in /lib.  This is to fix linking problems when you have
+# the .so in /lib, and the .a in /usr/lib.  What happens is that
+# in some cases when linking dynamic, the .a in /usr/lib is used
+# instead of the .so in /lib due to gcc/libtool tweaking ld's
+# library search path.  This causes many builds to fail.
+# See bug #4411 for more info.
+#
+# Note that you should in general use the unversioned name of
+# the library (libfoo.so), as ldconfig should usually update it
+# correctly to point to the latest version of the library present.
+gen_usr_ldscript() {
+	local lib libdir=$(get_libdir) output_format="" auto=false suffix=$(get_libname)
+	[[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/
+
+	# This code only matters when it's been enabled. #417451
+	use sep-usr || return 0
+
+	# We only care about stuffing / for the native ABI. #479448
+	if [[ $(type -t multilib_is_native_abi) == "function" ]] ; then
+		multilib_is_native_abi || return 0
+	fi
+
+	# Just make sure it exists
+	dodir /usr/${libdir}
+
+	if [[ $1 == "-a" ]] ; then
+		auto=true
+		shift
+		dodir /${libdir}
+	fi
+
+	# OUTPUT_FORMAT gives hints to the linker as to what binary format
+	# is referenced ... makes multilib saner
+	local flags=( ${CFLAGS} ${LDFLAGS} -Wl,--verbose )
+	if $(tc-getLD) --version | grep -q 'GNU gold' ; then
+		# If they're using gold, manually invoke the old bfd. #487696
+		local d="${T}/bfd-linker"
+		mkdir -p "${d}"
+		ln -sf $(which ${CHOST}-ld.bfd) "${d}"/ld
+		flags+=( -B"${d}" )
+	fi
+	output_format=$($(tc-getCC) "${flags[@]}" 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	for lib in "$@" ; do
+		local tlib
+		if ${auto} ; then
+			lib="lib${lib}${suffix}"
+		else
+			# Ensure /lib/${lib} exists to avoid dangling scripts/symlinks.
+			# This especially is for AIX where $(get_libname) can return ".a",
+			# so /lib/${lib} might be moved to /usr/lib/${lib} (by accident).
+			[[ -r ${ED}/${libdir}/${lib} ]] || continue
+			#TODO: better die here?
+		fi
+
+		case ${CTARGET:-${CHOST}} in
+		*-darwin*)
+			if ${auto} ; then
+				tlib=$(scanmacho -qF'%S#F' "${ED}"/usr/${libdir}/${lib})
+			else
+				tlib=$(scanmacho -qF'%S#F' "${ED}"/${libdir}/${lib})
+			fi
+			[[ -z ${tlib} ]] && die "unable to read install_name from ${lib}"
+			tlib=${tlib##*/}
+
+			if ${auto} ; then
+				mv "${ED}"/usr/${libdir}/${lib%${suffix}}.*${suffix#.} "${ED}"/${libdir}/ || die
+				# some install_names are funky: they encode a version
+				if [[ ${tlib} != ${lib%${suffix}}.*${suffix#.} ]] ; then
+					mv "${ED}"/usr/${libdir}/${tlib%${suffix}}.*${suffix#.} "${ED}"/${libdir}/ || die
+				fi
+				rm -f "${ED}"/${libdir}/${lib}
+			fi
+
+			# Mach-O files have an id, which is like a soname, it tells how
+			# another object linking against this lib should reference it.
+			# Since we moved the lib from usr/lib into lib this reference is
+			# wrong.  Hence, we update it here.  We don't configure with
+			# libdir=/lib because that messes up libtool files.
+			# Make sure we don't lose the specific version, so just modify the
+			# existing install_name
+			if [[ ! -w "${ED}/${libdir}/${tlib}" ]] ; then
+				chmod u+w "${ED}${libdir}/${tlib}" # needed to write to it
+				local nowrite=yes
+			fi
+			install_name_tool \
+				-id "${EPREFIX}"/${libdir}/${tlib} \
+				"${ED}"/${libdir}/${tlib} || die "install_name_tool failed"
+			[[ -n ${nowrite} ]] && chmod u-w "${ED}${libdir}/${tlib}"
+			# Now as we don't use GNU binutils and our linker doesn't
+			# understand linker scripts, just create a symlink.
+			pushd "${ED}/usr/${libdir}" > /dev/null
+			ln -snf "../../${libdir}/${tlib}" "${lib}"
+			popd > /dev/null
+			;;
+		*)
+			if ${auto} ; then
+				tlib=$(scanelf -qF'%S#F' "${ED}"/usr/${libdir}/${lib})
+				[[ -z ${tlib} ]] && die "unable to read SONAME from ${lib}"
+				mv "${ED}"/usr/${libdir}/${lib}* "${ED}"/${libdir}/ || die
+				# some SONAMEs are funky: they encode a version before the .so
+				if [[ ${tlib} != ${lib}* ]] ; then
+					mv "${ED}"/usr/${libdir}/${tlib}* "${ED}"/${libdir}/ || die
+				fi
+				rm -f "${ED}"/${libdir}/${lib}
+			else
+				tlib=${lib}
+			fi
+			cat > "${ED}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
+			/* GNU ld script
+			   Since Gentoo has critical dynamic libraries in /lib, and the static versions
+			   in /usr/lib, we need to have a "fake" dynamic lib in /usr/lib, otherwise we
+			   run into linking problems.  This "fake" dynamic lib is a linker script that
+			   redirects the linker to the real lib.  And yes, this works in the cross-
+			   compiling scenario as the sysroot-ed linker will prepend the real path.
+
+			   See bug https://bugs.gentoo.org/4411 for more info.
+			 */
+			${output_format}
+			GROUP ( ${EPREFIX}/${libdir}/${tlib} )
+			END_LDSCRIPT
+			;;
+		esac
+		fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
+	done
+}
+
+fi
diff --git a/profiles/use.desc b/profiles/use.desc
index 6acf19f..6297fee 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -299,6 +299,7 @@ seamonkey - Add support for the Seamonkey web-browser
 seccomp - Enable seccomp (secure computing mode) to perform system call filtering at runtime to increase security of programs
 selinux - !!internal use only!! Security Enhanced Linux support, this must be set by the selinux profile or breakage will occur
 semantic-desktop - Cross-KDE support for semantic search and information retrieval
+sep-usr - Install some critical files into / instead of /usr (for when /usr is a separate mount point)
 session - Add persistent session support
 sharedmem - Add support for shared memory use
 shorten - Add support for the shorten audio compressor
-- 
2.7.4

[gentoo-dev] [PATCH 02/21] profiles: mask USE=sep-usr for most systems

[Mike Frysinger]

---
 profiles/base/use.mask          | 3 +++
 profiles/default/bsd/use.mask   | 4 ++++
 profiles/default/linux/use.mask | 4 ++++
 profiles/prefix/darwin/use.mask | 4 ++++
 4 files changed, 15 insertions(+)

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 3127dad..8ef3e3a 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -396,3 +396,6 @@ openrc-force
 # sys-libs/libapparmor
 apparmor
 
+# Mike Frysinger <vapier@gentoo.org> (30 Mar 2016)
+# Most systems do not support a sep-/usr partition.
+sep-usr
diff --git a/profiles/default/bsd/use.mask b/profiles/default/bsd/use.mask
index ba2cd7f..5776edd 100644
--- a/profiles/default/bsd/use.mask
+++ b/profiles/default/bsd/use.mask
@@ -77,3 +77,7 @@ sane_backends_qcam
 # Diego E. Pettenò <flameeyes@gentoo.org> (19 oct 2010)
 # unmasking flags that only apply to FreeBSD
 -kqueue
+
+# Mike Frysinger <vapier@gentoo.org> (30 Mar 2016)
+# Allow people to opt-in to a sep-/usr partition.
+-sep-usr
diff --git a/profiles/default/linux/use.mask b/profiles/default/linux/use.mask
index 647b635..db46d3b 100644
--- a/profiles/default/linux/use.mask
+++ b/profiles/default/linux/use.mask
@@ -17,3 +17,7 @@ x264
 # Samuli Suominen <ssuominen@gentoo.org> (19 Apr 2013)
 # Linux specific module loading/unloading support
 -kmod
+
+# Mike Frysinger <vapier@gentoo.org> (30 Mar 2016)
+# Allow people to opt-in to a sep-/usr partition.
+-sep-usr
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 3b7c8f9..5473e88 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -43,3 +43,7 @@ v4l
 
 # introspection is far from working on OSX
 introspection
+
+# Mike Frysinger <vapier@gentoo.org> (30 Mar 2016)
+# Allow people to opt-in to a sep-/usr partition.
+-sep-usr
-- 
2.7.4

[gentoo-dev] [PATCH 03/21] sys-libs/zlib: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/zlib/zlib-1.2.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/zlib/zlib-1.2.8-r1.ebuild b/sys-libs/zlib/zlib-1.2.8-r1.ebuild
index 43a555a..23161b0 100644
--- a/sys-libs/zlib/zlib-1.2.8-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.8-r1.ebuild
@@ -5,7 +5,7 @@
 EAPI=4
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools toolchain-funcs multilib multilib-minimal
+inherit autotools toolchain-funcs multilib multilib-minimal sep-usr
 
 DESCRIPTION="Standard (de)compression library"
 HOMEPAGE="http://www.zlib.net/"
-- 
2.7.4

[gentoo-dev] [PATCH 04/21] sys-libs/pwdb: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/pwdb/pwdb-0.62.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild
index 920b19a..90f4a0e 100644
--- a/sys-libs/pwdb/pwdb-0.62.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic sep-usr
 
 DESCRIPTION="Password database"
 HOMEPAGE="https://packages.gentoo.org/package/sys-libs/pwdb"
-- 
2.7.4

[gentoo-dev] [PATCH 05/21] sys-libs/gpm: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/gpm/gpm-1.20.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-libs/gpm/gpm-1.20.7-r2.ebuild b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
index ee9f5a7..a29bf7e 100644
--- a/sys-libs/gpm/gpm-1.20.7-r2.ebuild
+++ b/sys-libs/gpm/gpm-1.20.7-r2.ebuild
@@ -6,7 +6,7 @@
 
 EAPI="4"
 
-inherit eutils systemd toolchain-funcs autotools multilib-minimal
+inherit eutils systemd toolchain-funcs autotools multilib-minimal sep-usr
 
 DESCRIPTION="Console-based mouse driver"
 HOMEPAGE="http://www.nico.schottelius.org/software/gpm/"
-- 
2.7.4

[gentoo-dev] [PATCH 06/21] app-arch/bzip2: switch to sep-usr eclass

[Mike Frysinger]

---
 app-arch/bzip2/bzip2-1.0.6-r6.ebuild | 2 +-
 app-arch/bzip2/bzip2-1.0.6-r7.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6-r6.ebuild b/app-arch/bzip2/bzip2-1.0.6-r6.ebuild
index d7b2cdf..95ce04d 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r6.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r6.ebuild
@@ -7,7 +7,7 @@
 
 EAPI=4
 
-inherit eutils toolchain-funcs multilib multilib-minimal
+inherit eutils toolchain-funcs multilib multilib-minimal sep-usr
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="http://www.bzip.org/"
diff --git a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
index 60d0df3..4092978 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r7.ebuild
@@ -7,7 +7,7 @@
 
 EAPI=4
 
-inherit eutils toolchain-funcs multilib multilib-minimal
+inherit eutils toolchain-funcs multilib multilib-minimal sep-usr
 
 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
 HOMEPAGE="http://www.bzip.org/"
-- 
2.7.4

[gentoo-dev] [PATCH 07/21] app-arch/xz-utils: switch to sep-usr eclass

[Mike Frysinger]

---
 app-arch/xz-utils/xz-utils-5.2.2.ebuild | 2 +-
 app-arch/xz-utils/xz-utils-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 34283d5..b5e54d2 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -7,7 +7,7 @@
 
 EAPI="4"
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit eutils multilib libtool multilib-minimal sep-usr
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index ac40bc4..784acf0 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -7,7 +7,7 @@
 
 EAPI="4"
 
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit eutils multilib libtool multilib-minimal sep-usr
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="http://git.tukaani.org/xz.git"
-- 
2.7.4

[gentoo-dev] [PATCH 08/21] sys-apps/acl: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-apps/acl/acl-2.2.52-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/acl/acl-2.2.52-r1.ebuild b/sys-apps/acl/acl-2.2.52-r1.ebuild
index d1d2169..e645a73 100644
--- a/sys-apps/acl/acl-2.2.52-r1.ebuild
+++ b/sys-apps/acl/acl-2.2.52-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils toolchain-funcs multilib-minimal
+inherit eutils multilib-minimal sep-usr
 
 DESCRIPTION="access control list utilities, libraries and headers"
 HOMEPAGE="http://savannah.nongnu.org/projects/acl"
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="nls static-libs"
 
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP},sep-usr?]
 	abi_x86_32? (
 		!<=app-emulation/emul-linux-x86-baselibs-20140406-r2
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-- 
2.7.4

[gentoo-dev] [PATCH 09/21] sys-apps/attr: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-apps/attr/attr-2.4.47-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/attr/attr-2.4.47-r2.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild
index 11a6bda..06bac92 100644
--- a/sys-apps/attr/attr-2.4.47-r2.ebuild
+++ b/sys-apps/attr/attr-2.4.47-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils toolchain-funcs multilib-minimal
+inherit eutils multilib-minimal sep-usr
 
 DESCRIPTION="Extended attributes tools"
 HOMEPAGE="http://savannah.nongnu.org/projects/attr"
-- 
2.7.4

[gentoo-dev] [PATCH 10/21] sys-libs/pam: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/pam/pam-1.2.1-r1.ebuild | 4 ++--
 sys-libs/pam/pam-1.2.1.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/pam/pam-1.2.1-r1.ebuild b/sys-libs/pam/pam-1.2.1-r1.ebuild
index a3e541d..6cb59da 100644
--- a/sys-libs/pam/pam-1.2.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use fcaps
+inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use sep-usr fcaps
 
 MY_PN="Linux-PAM"
 MY_P="${MY_PN}-${PV}"
@@ -138,7 +138,7 @@ multilib_src_install() {
 		sepermitlockdir="${EPREFIX}/run/sepermit"
 
 	local prefix
-	if multilib_is_native_abi; then
+	if use sep-usr; then
 		prefix=
 		gen_usr_ldscript -a pam pamc pam_misc
 	else
diff --git a/sys-libs/pam/pam-1.2.1.ebuild b/sys-libs/pam/pam-1.2.1.ebuild
index 8309dda..5241086 100644
--- a/sys-libs/pam/pam-1.2.1.ebuild
+++ b/sys-libs/pam/pam-1.2.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use
+inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use sep-usr
 
 MY_PN="Linux-PAM"
 MY_P="${MY_PN}-${PV}"
@@ -136,7 +136,7 @@ multilib_src_install() {
 		sepermitlockdir="${EPREFIX}/run/sepermit"
 
 	local prefix
-	if multilib_is_native_abi; then
+	if use sep-usr; then
 		prefix=
 		gen_usr_ldscript -a pam pamc pam_misc
 	else
-- 
2.7.4

[gentoo-dev] [PATCH 11/21] dev-libs/lzo: switch to sep-usr eclass

[Mike Frysinger]

---
 dev-libs/lzo/lzo-2.08-r1.ebuild | 2 +-
 dev-libs/lzo/lzo-2.09.ebuild    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/lzo/lzo-2.08-r1.ebuild b/dev-libs/lzo/lzo-2.08-r1.ebuild
index f3cff4b..e988b96 100644
--- a/dev-libs/lzo/lzo-2.08-r1.ebuild
+++ b/dev-libs/lzo/lzo-2.08-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib-minimal toolchain-funcs
+inherit eutils multilib-minimal sep-usr
 
 DESCRIPTION="An extremely fast compression and decompression library"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
diff --git a/dev-libs/lzo/lzo-2.09.ebuild b/dev-libs/lzo/lzo-2.09.ebuild
index f3cff4b..e988b96 100644
--- a/dev-libs/lzo/lzo-2.09.ebuild
+++ b/dev-libs/lzo/lzo-2.09.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib-minimal toolchain-funcs
+inherit eutils multilib-minimal sep-usr
 
 DESCRIPTION="An extremely fast compression and decompression library"
 HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
-- 
2.7.4

[gentoo-dev] [PATCH 12/21] sys-libs/readline: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/readline/readline-6.2_p5-r1.ebuild | 2 +-
 sys-libs/readline/readline-6.3_p8-r1.ebuild | 2 +-
 sys-libs/readline/readline-6.3_p8-r2.ebuild | 2 +-
 sys-libs/readline/readline-7.0_rc1.ebuild   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/readline/readline-6.2_p5-r1.ebuild b/sys-libs/readline/readline-6.2_p5-r1.ebuild
index 36ffdf4..153fbdd 100644
--- a/sys-libs/readline/readline-6.2_p5-r1.ebuild
+++ b/sys-libs/readline/readline-6.2_p5-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal sep-usr
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/
diff --git a/sys-libs/readline/readline-6.3_p8-r1.ebuild b/sys-libs/readline/readline-6.3_p8-r1.ebuild
index 98588d9..a51cb78c 100644
--- a/sys-libs/readline/readline-6.3_p8-r1.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal sep-usr
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
diff --git a/sys-libs/readline/readline-6.3_p8-r2.ebuild b/sys-libs/readline/readline-6.3_p8-r2.ebuild
index ad21882..eca2b24 100644
--- a/sys-libs/readline/readline-6.3_p8-r2.ebuild
+++ b/sys-libs/readline/readline-6.3_p8-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal sep-usr
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
diff --git a/sys-libs/readline/readline-7.0_rc1.ebuild b/sys-libs/readline/readline-7.0_rc1.ebuild
index da06224..ccbe927 100644
--- a/sys-libs/readline/readline-7.0_rc1.ebuild
+++ b/sys-libs/readline/readline-7.0_rc1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
+inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal sep-usr
 
 # Official patches
 # See ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/
-- 
2.7.4

[gentoo-dev] [PATCH 13/21] sys-apps/keyutils: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-apps/keyutils/keyutils-1.5.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
index 7b8ddbf..7a813c0 100644
--- a/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.9-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit multilib eutils toolchain-funcs linux-info multilib-minimal
+inherit multilib eutils toolchain-funcs linux-info multilib-minimal sep-usr
 
 DESCRIPTION="Linux Key Management Utilities"
 HOMEPAGE="https://people.redhat.com/dhowells/keyutils/"
-- 
2.7.4

[gentoo-dev] [PATCH 14/21] dev-libs/libaio: switch to sep-usr eclass

[Mike Frysinger]

---
 dev-libs/libaio/libaio-0.3.110.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
index 0605dbe..f625ba7 100644
--- a/dev-libs/libaio/libaio-0.3.110.ebuild
+++ b/dev-libs/libaio/libaio-0.3.110.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib-minimal toolchain-funcs flag-o-matic
+inherit eutils multilib-minimal toolchain-funcs flag-o-matic sep-usr
 
 DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
 HOMEPAGE="https://git.fedorahosted.org/cgit/libaio.git/  http://lse.sourceforge.net/io/aio.html"
-- 
2.7.4

[gentoo-dev] [PATCH 15/21] sys-libs/libcap: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/libcap/libcap-2.24-r2.ebuild | 4 ++--
 sys-libs/libcap/libcap-2.25.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/libcap/libcap-2.24-r2.ebuild b/sys-libs/libcap/libcap-2.24-r2.ebuild
index 1585662..6c8f163 100644
--- a/sys-libs/libcap/libcap-2.24-r2.ebuild
+++ b/sys-libs/libcap/libcap-2.24-r2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils multilib multilib-minimal toolchain-funcs pam
+inherit eutils multilib multilib-minimal toolchain-funcs pam sep-usr
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="pam static-libs"
 
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP},sep-usr?]
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
diff --git a/sys-libs/libcap/libcap-2.25.ebuild b/sys-libs/libcap/libcap-2.25.ebuild
index fc4a23b..2b7aa6e 100644
--- a/sys-libs/libcap/libcap-2.25.ebuild
+++ b/sys-libs/libcap/libcap-2.25.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils multilib multilib-minimal toolchain-funcs pam
+inherit eutils multilib multilib-minimal toolchain-funcs pam sep-usr
 
 DESCRIPTION="POSIX 1003.1e capabilities"
 HOMEPAGE="http://www.friedhoff.org/posixfilecaps.html"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux"
 IUSE="pam static-libs"
 
-RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
+RDEPEND=">=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP},sep-usr?]
 	pam? ( virtual/pam )"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers"
-- 
2.7.4

[gentoo-dev] [PATCH 16/21] sys-libs/cracklib: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/cracklib/cracklib-2.9.1-r1.ebuild | 4 ++--
 sys-libs/cracklib/cracklib-2.9.4.ebuild    | 4 ++--
 sys-libs/cracklib/cracklib-2.9.5.ebuild    | 4 ++--
 sys-libs/cracklib/cracklib-2.9.6.ebuild    | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
index 792bb37..c7e36a4 100644
--- a/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs
+inherit eutils distutils-r1 libtool multilib-minimal sep-usr
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs test zlib"
 
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[sep-usr?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sys-libs/cracklib/cracklib-2.9.4.ebuild b/sys-libs/cracklib/cracklib-2.9.4.ebuild
index a826ef9..f2fa977 100644
--- a/sys-libs/cracklib/cracklib-2.9.4.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.4.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs
+inherit eutils distutils-r1 libtool multilib-minimal sep-usr
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs test zlib"
 
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[sep-usr?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sys-libs/cracklib/cracklib-2.9.5.ebuild b/sys-libs/cracklib/cracklib-2.9.5.ebuild
index a826ef9..f2fa977 100644
--- a/sys-libs/cracklib/cracklib-2.9.5.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.5.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs
+inherit eutils distutils-r1 libtool multilib-minimal sep-usr
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs test zlib"
 
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[sep-usr?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sys-libs/cracklib/cracklib-2.9.6.ebuild b/sys-libs/cracklib/cracklib-2.9.6.ebuild
index dda19c0..fa3143a 100644
--- a/sys-libs/cracklib/cracklib-2.9.6.ebuild
+++ b/sys-libs/cracklib/cracklib-2.9.6.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils-r1 libtool multilib-minimal toolchain-funcs
+inherit eutils distutils-r1 libtool multilib-minimal sep-usr
 
 MY_P=${P/_}
 DESCRIPTION="Password Checking Library"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
 IUSE="nls python static-libs test zlib"
 
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[sep-usr?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	python? (
 		dev-python/setuptools[${PYTHON_USEDEP}]
-- 
2.7.4

[gentoo-dev] [PATCH 17/21] sys-libs/ncurses: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-libs/ncurses/ncurses-5.9-r101.ebuild | 4 ++--
 sys-libs/ncurses/ncurses-5.9-r3.ebuild   | 4 ++--
 sys-libs/ncurses/ncurses-5.9-r4.ebuild   | 4 ++--
 sys-libs/ncurses/ncurses-5.9-r5.ebuild   | 4 ++--
 sys-libs/ncurses/ncurses-5.9-r99.ebuild  | 4 ++--
 sys-libs/ncurses/ncurses-6.0-r1.ebuild   | 4 ++--
 sys-libs/ncurses/ncurses-6.0.ebuild      | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys-libs/ncurses/ncurses-5.9-r101.ebuild b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
index 541bb16..69de05f 100644
--- a/sys-libs/ncurses/ncurses-5.9-r101.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r101.ebuild
@@ -6,7 +6,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs multilib-minimal multiprocessing
+inherit eutils toolchain-funcs multilib-minimal multiprocessing sep-usr
 
 MY_PV=${PV:0:3}
 MY_P=${PN}-${MY_PV}
@@ -20,7 +20,7 @@ SLOT="5/5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="gpm tinfo unicode"
 
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP},sep-usr?] )"
 # Block the ncurses-5 that installs the same lib. #557472
 RDEPEND="${DEPEND}
 	!<sys-libs/ncurses-6:0"
diff --git a/sys-libs/ncurses/ncurses-5.9-r3.ebuild b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
index 0f383d5..b62c334 100644
--- a/sys-libs/ncurses/ncurses-5.9-r3.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r3.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="4"
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal sep-usr
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
-DEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="gpm? ( sys-libs/gpm[sep-usr?] )"
 #	berkdb? ( sys-libs/db )"
 # Block the older ncurses that installed all files w/SLOT=5. #557472
 RDEPEND="${DEPEND}
diff --git a/sys-libs/ncurses/ncurses-5.9-r4.ebuild b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
index ea8dacf..de1e5b0 100644
--- a/sys-libs/ncurses/ncurses-5.9-r4.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r4.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI="4"
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal sep-usr
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
-DEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="gpm? ( sys-libs/gpm[sep-usr?] )"
 #	berkdb? ( sys-libs/db )"
 # Block the older ncurses that installed all files w/SLOT=5. #557472
 RDEPEND="${DEPEND}
diff --git a/sys-libs/ncurses/ncurses-5.9-r5.ebuild b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
index 698ed64..ce41a64 100644
--- a/sys-libs/ncurses/ncurses-5.9-r5.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r5.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal sep-usr
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
@@ -19,7 +19,7 @@ SLOT="0/5"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs tinfo trace unicode"
 
-DEPEND="gpm? ( sys-libs/gpm )"
+DEPEND="gpm? ( sys-libs/gpm[sep-usr?] )"
 #	berkdb? ( sys-libs/db )"
 # Block the older ncurses that installed all files w/SLOT=5. #557472
 RDEPEND="${DEPEND}
diff --git a/sys-libs/ncurses/ncurses-5.9-r99.ebuild b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
index d8a8266..70b9797 100644
--- a/sys-libs/ncurses/ncurses-5.9-r99.ebuild
+++ b/sys-libs/ncurses/ncurses-5.9-r99.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
 LICENSE="metapackage"
 SLOT="5/5"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ada +cxx gpm static-libs tinfo unicode"
+IUSE="ada +cxx gpm sep-usr static-libs tinfo unicode"
 
-DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
+DEPEND="sys-libs/ncurses:0/5[ada?,cxx?,gpm?,sep-usr?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
diff --git a/sys-libs/ncurses/ncurses-6.0-r1.ebuild b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
index 029591b..ba51035 100644
--- a/sys-libs/ncurses/ncurses-6.0-r1.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing
+inherit eutils flag-o-matic toolchain-funcs multilib-minimal multiprocessing sep-usr
 
 MY_PV=${PV:0:3}
 PV_SNAP=${PV:4}
@@ -19,7 +19,7 @@ SLOT="0/6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="ada +cxx debug doc gpm minimal profile static-libs test threads tinfo trace unicode"
 
-DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP}] )"
+DEPEND="gpm? ( sys-libs/gpm[${MULTILIB_USEDEP},sep-usr?] )"
 #	berkdb? ( sys-libs/db )"
 # Block the older ncurses that installed all files w/SLOT=5. #557472
 RDEPEND="${DEPEND}
diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
index 3b85135..fd9c94d 100644
--- a/sys-libs/ncurses/ncurses-6.0.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
 LICENSE="metapackage"
 SLOT="5/6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="ada +cxx gpm static-libs tinfo unicode"
+IUSE="ada +cxx gpm sep-usr static-libs tinfo unicode"
 
-DEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
+DEPEND="sys-libs/ncurses:0/6[ada?,cxx?,gpm?,sep-usr?,static-libs?,tinfo?,unicode?,${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
-- 
2.7.4

[gentoo-dev] [PATCH 18/21] dev-libs/libpwquality: switch to sep-usr eclass

[Mike Frysinger]

---
 dev-libs/libpwquality/libpwquality-1.3.0.ebuild | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
index e2597b0..8082188 100644
--- a/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.3.0.ebuild
@@ -5,7 +5,7 @@
 EAPI="5"
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit eutils multilib pam python-r1 toolchain-funcs
+inherit eutils multilib pam python-r1 sep-usr
 
 DESCRIPTION="Library for password quality checking and generating random passwords"
 HOMEPAGE="https://fedorahosted.org/libpwquality/"
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="pam python static-libs"
 
 RDEPEND="
-	>=sys-libs/cracklib-2.8:=
+	>=sys-libs/cracklib-2.8:=[sep-usr?]
 	pam? ( virtual/pam )
 	python? ( ${PYTHON_DEPS} )
 "
@@ -38,7 +38,6 @@ src_configure() {
 	configuring() {
 		local sitedir
 		econf \
-			--libdir="${EPREFIX}/$(get_libdir)" \
 			$(use_enable pam) \
 			--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
 			$(use_enable python python-bindings) \
@@ -58,12 +57,7 @@ src_test() {
 
 src_install() {
 	if_use_python_python_foreach_impl default
-	if use static-libs; then
-		# Do not install static libs in /lib
-		mkdir -p "${ED}usr/$(get_libdir)"
-		mv "${ED}$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
-		gen_usr_ldscript libpwquality.so
-	fi
+	gen_usr_ldscript -a pwquality
 	prune_libtool_files --modules
 }
 
-- 
2.7.4

[gentoo-dev] [PATCH 19/21] dev-libs/libedit: switch to sep-usr eclass

[Mike Frysinger]

---
 dev-libs/libedit/libedit-20130712.3.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libedit/libedit-20130712.3.1.ebuild b/dev-libs/libedit/libedit-20130712.3.1.ebuild
index 50e38d6..4b1202f 100644
--- a/dev-libs/libedit/libedit-20130712.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20130712.3.1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=5
 
-inherit eutils toolchain-funcs versionator base multilib-minimal
+inherit eutils toolchain-funcs versionator base multilib-minimal sep-usr
 
 MY_PV=$(get_major_version)-$(get_after_major_version)
 MY_P=${PN}-${MY_PV}
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
-DEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]
+DEPEND=">=sys-libs/ncurses-5.9-r3[sep-usr?,static-libs?,${MULTILIB_USEDEP}]
 	!<=sys-freebsd/freebsd-lib-6.2_rc1"
 
 RDEPEND=${DEPEND}
-- 
2.7.4

[gentoo-dev] [PATCH 20/21] dev-libs/libpcre: switch to sep-usr eclass

[Mike Frysinger]

---
 dev-libs/libpcre/libpcre-8.38.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/libpcre/libpcre-8.38.ebuild b/dev-libs/libpcre/libpcre-8.38.ebuild
index fcda8d2..f7c64aa 100644
--- a/dev-libs/libpcre/libpcre-8.38.ebuild
+++ b/dev-libs/libpcre/libpcre-8.38.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal sep-usr
 
 DESCRIPTION="Perl-compatible regular expression library"
 HOMEPAGE="http://www.pcre.org/"
@@ -24,10 +24,10 @@ IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-li
 REQUIRED_USE="readline? ( !libedit )
 	libedit? ( !readline )"
 
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	zlib? ( sys-libs/zlib )
-	libedit? ( dev-libs/libedit )
-	readline? ( sys-libs/readline:0= )"
+RDEPEND="bzip2? ( app-arch/bzip2[sep-usr?] )
+	zlib? ( sys-libs/zlib[sep-usr?] )
+	libedit? ( dev-libs/libedit[sep-usr?] )
+	readline? ( sys-libs/readline:0=[sep-usr?] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${RDEPEND}
-- 
2.7.4

[gentoo-dev] [PATCH 21/21] sys-apps/tcp-wrappers: switch to sep-usr eclass

[Mike Frysinger]

---
 sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
index 1496b09..4923e85 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal
+inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal sep-usr
 
 MY_PV=$(get_version_component_range 1-2)
 DEB_PV=$(get_version_component_range 3)
-- 
2.7.4

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Thursday, March 31, 2016 1:58:19 AM CEST, Mike Frysinger wrote:
> To make forward progress on bug 417451, introduce a new sep-usr eclass
> that will hold all logic related to having a separate /usr.  For now,
> this is just the gen_usr_ldscript function and a new USE=sep-usr flag.

Good idea, thanks. I'm not 100% convinced it is worth a useflag (instead of 
e.g. a make.defaults variable that one can override in make.conf), but why 
not.

> All ebuilds that call gen_usr_ldscript today will migrate to this and
> will allow people to move away from installing things into /.  For the
> systems that want to have a split-/usr partition, they can turn on this
> USE flag across their system.

Your patchset seems to be missing some ebuilds in that regard: expat and 
sys-freebsd/* come to mind.


> This also allows us to mask the flag on many targets where it doesn't
> make sense (like most prefix setups) and where we don't want to support
> it at all.

It should be noted that, unless I missed something, the default settings 
will *not anymore* allow sep-usr after this patchset (sep-usr useflag will 
be disabled). This should be advertised more (a news item?) or simply 
sep-usr added to make.defaults. The latter will also enable busybox's 
sep-usr support.

Alexis.

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Gilbert]

On Wed, Mar 30, 2016 at 7:58 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> To make forward progress on bug 417451, introduce a new sep-usr eclass
> that will hold all logic related to having a separate /usr.  For now,
> this is just the gen_usr_ldscript function and a new USE=sep-usr flag.

Seems like a decent idea.

Before this flag gets added, should we define some bounds? I just
don't want to see this flag get abused by using it to move other files
around randomly, like moving things from /bin to /usr/bin, etc.

> All ebuilds that call gen_usr_ldscript today will migrate to this and
> will allow people to move away from installing things into /.  For the
> systems that want to have a split-/usr partition, they can turn on this
> USE flag across their system.

So the sep-usr flag will be disabled by default? That's going to
trigger a change from the current state, and will definitely need to
be announced.

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1536 bytes --]

On 31 Mar 2016 16:05, Alexis Ballier wrote:
> On Thursday, March 31, 2016 1:58:19 AM CEST, Mike Frysinger wrote:
> > All ebuilds that call gen_usr_ldscript today will migrate to this and
> > will allow people to move away from installing things into /.  For the
> > systems that want to have a split-/usr partition, they can turn on this
> > USE flag across their system.
> 
> Your patchset seems to be missing some ebuilds in that regard: expat and 
> sys-freebsd/* come to mind.

i did not do a full migration as i got bored, but i did do enough to show
it in action.  the current method does not require all be converted at the
same time though, so it can be left up to maintainers of relevant packages
to do the change over themselves.

> > This also allows us to mask the flag on many targets where it doesn't
> > make sense (like most prefix setups) and where we don't want to support
> > it at all.
> 
> It should be noted that, unless I missed something, the default settings 
> will *not anymore* allow sep-usr after this patchset (sep-usr useflag will 
> be disabled). This should be advertised more (a news item?) or simply 
> sep-usr added to make.defaults. The latter will also enable busybox's 
> sep-usr support.

the patchset allows for some targets (notably Linux systems) to control
whether the flag is enabled.  it is turned off by default and i think
that's the behavior we want.  i have not forced enabled it for any target
but maybe the prefix/darwin guys will want to do that.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]

On 31 Mar 2016 10:12, Mike Gilbert wrote:
> On Wed, Mar 30, 2016 at 7:58 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> > To make forward progress on bug 417451, introduce a new sep-usr eclass
> > that will hold all logic related to having a separate /usr.  For now,
> > this is just the gen_usr_ldscript function and a new USE=sep-usr flag.
> 
> Seems like a decent idea.
> 
> Before this flag gets added, should we define some bounds? I just
> don't want to see this flag get abused by using it to move other files
> around randomly, like moving things from /bin to /usr/bin, etc.

i think we can scope it currently for libs (and any data files they need),
but i don't see it being a bad thing to leverage it for /bin progs.

> > All ebuilds that call gen_usr_ldscript today will migrate to this and
> > will allow people to move away from installing things into /.  For the
> > systems that want to have a split-/usr partition, they can turn on this
> > USE flag across their system.
> 
> So the sep-usr flag will be disabled by default? That's going to
> trigger a change from the current state, and will definitely need to
> be announced.

correct.  i can put together a news item.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Thursday, March 31, 2016 6:07:28 PM CEST, Mike Frysinger wrote:
> On 31 Mar 2016 16:05, Alexis Ballier wrote:
>> On Thursday, March 31, 2016 1:58:19 AM CEST, Mike Frysinger wrote:
>>> All ebuilds that call gen_usr_ldscript today will migrate to this and
>>> will allow people to move away from installing things into /.  For the
>>> systems that want to have a split-/usr partition, they can turn on this
>>> USE flag across their system.
>> 
>> Your patchset seems to be missing some ebuilds in that regard: expat and 
>> sys-freebsd/* come to mind.
>
> i did not do a full migration as i got bored, but i did do enough to show
> it in action.  the current method does not require all be converted at the
> same time though, so it can be left up to maintainers of relevant packages
> to do the change over themselves.

i dont think anybody expects you to post tree-wide conversion patches to 
-dev ml :)

but i also dont think it is a good idea to leave the toolchain-funcs 
version around, and if you want to drop it, you'll have to fill bugs to let 
ppl know, which is probably more work than adding 8 chars to an inherit 
line that can be automated


>>> This also allows us to mask the flag on many targets where it doesn't
>>> make sense (like most prefix setups) and where we don't want to support
>>> it at all.
>> 
>> It should be noted that, unless I missed something, the default settings 
>> will *not anymore* allow sep-usr after this patchset (sep-usr 
>> useflag will 
>> be disabled). This should be advertised more (a news item?) or simply 
>> sep-usr added to make.defaults. The latter will also enable busybox's 
>> sep-usr support.
>
> the patchset allows for some targets (notably Linux systems) to control
> whether the flag is enabled.  it is turned off by default and i think
> that's the behavior we want.  i have not forced enabled it for any target
> but maybe the prefix/darwin guys will want to do that.

not sure if this was phrased as such, but I seem to recall a council 
decision stating that separate /usr should be made easy to users unless 
this causes serious issues; thus, no, I don't think that is the behavior we 
want :)

Alexis.

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Thursday, March 31, 2016 6:08:52 PM CEST, Mike Frysinger wrote:
> On 31 Mar 2016 10:12, Mike Gilbert wrote:
>> On Wed, Mar 30, 2016 at 7:58 PM, Mike Frysinger 
>> <vapier@gentoo.org> wrote: ...
>
> i think we can scope it currently for libs (and any data files they need),
> but i don't see it being a bad thing to leverage it for /bin progs.


unless you symlink /bin to /usr/bin, moving binaries around has wider 
implications than sep-usr

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 2617 bytes --]

On 31 Mar 2016 19:00, Alexis Ballier wrote:
> On Thursday, March 31, 2016 6:07:28 PM CEST, Mike Frysinger wrote:
> > On 31 Mar 2016 16:05, Alexis Ballier wrote:
> >> On Thursday, March 31, 2016 1:58:19 AM CEST, Mike Frysinger wrote:
> >>> All ebuilds that call gen_usr_ldscript today will migrate to this and
> >>> will allow people to move away from installing things into /.  For the
> >>> systems that want to have a split-/usr partition, they can turn on this
> >>> USE flag across their system.
> >> 
> >> Your patchset seems to be missing some ebuilds in that regard: expat and 
> >> sys-freebsd/* come to mind.
> >
> > i did not do a full migration as i got bored, but i did do enough to show
> > it in action.  the current method does not require all be converted at the
> > same time though, so it can be left up to maintainers of relevant packages
> > to do the change over themselves.
> 
> i dont think anybody expects you to post tree-wide conversion patches to 
> -dev ml :)
> 
> but i also dont think it is a good idea to leave the toolchain-funcs 
> version around, and if you want to drop it, you'll have to fill bugs to let 
> ppl know, which is probably more work than adding 8 chars to an inherit 
> line that can be automated

sure -- backwards compat won't be dropped until we're confident everyone
has migrated over

> >>> This also allows us to mask the flag on many targets where it doesn't
> >>> make sense (like most prefix setups) and where we don't want to support
> >>> it at all.
> >> 
> >> It should be noted that, unless I missed something, the default settings 
> >> will *not anymore* allow sep-usr after this patchset (sep-usr 
> >> useflag will 
> >> be disabled). This should be advertised more (a news item?) or simply 
> >> sep-usr added to make.defaults. The latter will also enable busybox's 
> >> sep-usr support.
> >
> > the patchset allows for some targets (notably Linux systems) to control
> > whether the flag is enabled.  it is turned off by default and i think
> > that's the behavior we want.  i have not forced enabled it for any target
> > but maybe the prefix/darwin guys will want to do that.
> 
> not sure if this was phrased as such, but I seem to recall a council 
> decision stating that separate /usr should be made easy to users unless 
> this causes serious issues; thus, no, I don't think that is the behavior we 
> want :)

pretty sure the decision was that it's not required to be supported.  and
regardless of that, i don't see the default behavior of being off as being
contra "easy to use".
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

On 31 Mar 2016 19:03, Alexis Ballier wrote:
> On Thursday, March 31, 2016 6:08:52 PM CEST, Mike Frysinger wrote:
> > On 31 Mar 2016 10:12, Mike Gilbert wrote:
> >> On Wed, Mar 30, 2016 at 7:58 PM, Mike Frysinger 
> >> <vapier@gentoo.org> wrote: ...
> >
> > i think we can scope it currently for libs (and any data files they need),
> > but i don't see it being a bad thing to leverage it for /bin progs.
> 
> unless you symlink /bin to /usr/bin, moving binaries around has wider 
> implications than sep-usr

no valid package will be affected.  if you're hardcoding `/bin/foo`, then
you're doing it wrong already and that's your fault.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Thursday, March 31, 2016 8:19:52 PM CEST, Mike Frysinger wrote:
> On 31 Mar 2016 19:00, Alexis Ballier wrote:
>> On Thursday, March 31, 2016 6:07:28 PM CEST, Mike Frysinger wrote:
>>> On 31 Mar 2016 16:05, Alexis Ballier wrote: ...
>> 
>> i dont think anybody expects you to post tree-wide conversion patches to 
>> -dev ml :)
>> 
>> but i also dont think it is a good idea to leave the toolchain-funcs 
>> version around, and if you want to drop it, you'll have to 
>> fill bugs to let 
>> ppl know, which is probably more work than adding 8 chars to an inherit 
>> line that can be automated
>
> sure -- backwards compat won't be dropped until we're confident everyone
> has migrated over


... which introduces a mess to track what has been converted and what not 
while it can be done once and for good

>>> ...
>> not sure if this was phrased as such, but I seem to recall a council 
>> decision stating that separate /usr should be made easy to users unless 
>> this causes serious issues; thus, no, I don't think that is 
>> the behavior we 
>> want :) ...
>
> pretty sure the decision was that it's not required to be supported.

lemme look it up for you then:
https://wiki.gentoo.org/wiki/Council_decisions

systems with separate /usr should be supported. However, users shouldn't be 
constrained from using software which doesn't support that. -- 04/2012 
meeting

The council has voted in favour of a separate /usr being supported
(5 yes, 1 no vote).

>  and
> regardless of that, i don't see the default behavior of being off as being
> contra "easy to use".

but you're right there, it doesn't make it hard to use, just not working 
out of the box, which is already debatable; however, with eudev being the 
default I don't think there is anything preventing it atm with a default 
setup, but i might certainly stand corrected there

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Thursday, March 31, 2016 8:20:45 PM CEST, Mike Frysinger wrote:
> On 31 Mar 2016 19:03, Alexis Ballier wrote:
>> On Thursday, March 31, 2016 6:08:52 PM CEST, Mike Frysinger wrote:
>>> On 31 Mar 2016 10:12, Mike Gilbert wrote: ...
>> 
>> unless you symlink /bin to /usr/bin, moving binaries around has wider 
>> implications than sep-usr
>
> no valid package will be affected.  if you're hardcoding `/bin/foo`, then
> you're doing it wrong already and that's your fault.

since when '#! /bin/sh' is invalid at the top of a shell script ? or even 
execv deprecated ?

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

On 31 Mar 2016 21:13, Alexis Ballier wrote:
> On Thursday, March 31, 2016 8:20:45 PM CEST, Mike Frysinger wrote:
> > On 31 Mar 2016 19:03, Alexis Ballier wrote:
> >> On Thursday, March 31, 2016 6:08:52 PM CEST, Mike Frysinger wrote:
> >>> On 31 Mar 2016 10:12, Mike Gilbert wrote: ...
> >> 
> >> unless you symlink /bin to /usr/bin, moving binaries around has wider 
> >> implications than sep-usr
> >
> > no valid package will be affected.  if you're hardcoding `/bin/foo`, then
> > you're doing it wrong already and that's your fault.
> 
> since when '#! /bin/sh' is invalid at the top of a shell script ? or even 
> execv deprecated ?

there are exceptions for a few very well known programs, but a few shebangs
does not mean supporting `/bin/cut` or `/bin/kmod` is required.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 2284 bytes --]

On 31 Mar 2016 21:09, Alexis Ballier wrote:
> On Thursday, March 31, 2016 8:19:52 PM CEST, Mike Frysinger wrote:
> > On 31 Mar 2016 19:00, Alexis Ballier wrote:
> >> On Thursday, March 31, 2016 6:07:28 PM CEST, Mike Frysinger wrote:
> >>> On 31 Mar 2016 16:05, Alexis Ballier wrote: ...
> >> 
> >> i dont think anybody expects you to post tree-wide conversion patches to 
> >> -dev ml :)
> >> 
> >> but i also dont think it is a good idea to leave the toolchain-funcs 
> >> version around, and if you want to drop it, you'll have to 
> >> fill bugs to let 
> >> ppl know, which is probably more work than adding 8 chars to an inherit 
> >> line that can be automated
> >
> > sure -- backwards compat won't be dropped until we're confident everyone
> > has migrated over
> 
> ... which introduces a mess to track what has been converted and what not 
> while it can be done once and for good

not really.  a simple grep in the tree for the single func being dropped
is fairly trivial.

> >>> ...
> >> not sure if this was phrased as such, but I seem to recall a council 
> >> decision stating that separate /usr should be made easy to users unless 
> >> this causes serious issues; thus, no, I don't think that is 
> >> the behavior we 
> >> want :) ...
> >
> > pretty sure the decision was that it's not required to be supported.
> 
> lemme look it up for you then:
> https://wiki.gentoo.org/wiki/Council_decisions
> 
> systems with separate /usr should be supported. However, users shouldn't be 
> constrained from using software which doesn't support that. -- 04/2012 
> meeting
> 
> The council has voted in favour of a separate /usr being supported
> (5 yes, 1 no vote).
> 
> >  and
> > regardless of that, i don't see the default behavior of being off as being
> > contra "easy to use".
> 
> but you're right there, it doesn't make it hard to use, just not working 
> out of the box, which is already debatable; however, with eudev being the 
> default I don't think there is anything preventing it atm with a default 
> setup, but i might certainly stand corrected there

"being supported" != "enabled by default".  so no, i still don't see any
requirement in anything you've cited that this be turned on by default.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Friday, April 1, 2016 3:58:18 AM CEST, Mike Frysinger wrote:
>>> ...
>> lemme look it up for you then:
>> https://wiki.gentoo.org/wiki/Council_decisions
>> 
>> systems with separate /usr should be supported. However, users 
>> shouldn't be 
>> constrained from using software which doesn't support that. -- 04/2012 
>> meeting ...
>
> "being supported" != "enabled by default".  so no, i still don't see any
> requirement in anything you've cited that this be turned on by default.

you're right, but you know, before you claimed the contrary of what was 
voted and then decided to argue whether a 4 years old council decision 
applies or not here, my point was, and still is, that such council 
decisions make me think you're confusing what *you* want and what *we* (as 
a project) want for this case

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Mike Frysinger]

[-- Attachment #1: Type: text/plain, Size: 1393 bytes --]

On 01 Apr 2016 20:00, Alexis Ballier wrote:
> On Friday, April 1, 2016 3:58:18 AM CEST, Mike Frysinger wrote:
> >>> ...
> >> lemme look it up for you then:
> >> https://wiki.gentoo.org/wiki/Council_decisions
> >> 
> >> systems with separate /usr should be supported. However, users 
> >> shouldn't be 
> >> constrained from using software which doesn't support that. -- 04/2012 
> >> meeting ...
> >
> > "being supported" != "enabled by default".  so no, i still don't see any
> > requirement in anything you've cited that this be turned on by default.
> 
> you're right, but you know, before you claimed the contrary of what was 
> voted and then decided to argue whether a 4 years old council decision 
> applies or not here, my point was, and still is, that such council 
> decisions make me think you're confusing what *you* want and what *we* (as 
> a project) want for this case

i see no significant number of people clamoring for this as the default.
the bug that started this has everyone on board for changing the default.
it's really no different either from the install process today: a stage3
cannot be unpacked & booted directly.  a user must configure it before it
can actually be used.  if that means enabling USE=sep-usr, then so be it.
there's no reason to force this legacy behavior on the majority of people
when a split-/usr is uncommon.
-mike

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Friday, April 1, 2016 8:33:02 PM CEST, Mike Frysinger wrote:
> On 01 Apr 2016 20:00, Alexis Ballier wrote:
>> On Friday, April 1, 2016 3:58:18 AM CEST, Mike Frysinger wrote:
>>>> ...
>>> "being supported" != "enabled by default".  so no, i still don't see any
>>> requirement in anything you've cited that this be turned on 
>>> by default. ...
>> 
>> you're right, but you know, before you claimed the contrary of what was 
>> voted and then decided to argue whether a 4 years old council decision 
>> applies or not here, my point was, and still is, that such council 
>> decisions make me think you're confusing what *you* want and 
>> what *we* (as 
>> a project) want for this case
>
> i see no significant number of people clamoring for this as the default.
> the bug that started this has everyone on board for changing the default.

yes; I also tend to think fedora's usr move is what makes most sense 
nowadays, but that'd go against council

> it's really no different either from the install process today: a stage3
> cannot be unpacked & booted directly.  a user must configure it before it
> can actually be used.  if that means enabling USE=sep-usr, then so be it.

except it adds yet another step

> there's no reason to force this legacy behavior on the majority of people
> when a split-/usr is uncommon.

what's the reason not to force it? saving 10kb from ldscripts out of a 1Gb 
typical desktop install ? doesnt seem like a reason for disabling it either

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 1920 bytes --]

On Fri, Apr 01, 2016 at 09:36:56PM +0200, Alexis Ballier wrote:
> On Friday, April 1, 2016 8:33:02 PM CEST, Mike Frysinger wrote:
> > On 01 Apr 2016 20:00, Alexis Ballier wrote:
> >> On Friday, April 1, 2016 3:58:18 AM CEST, Mike Frysinger wrote:
> >>>> ...
> >>> "being supported" != "enabled by default".  so no, i still don't see any
> >>> requirement in anything you've cited that this be turned on 
> >>> by default. ...
> >> 
> >> you're right, but you know, before you claimed the contrary of what was 
> >> voted and then decided to argue whether a 4 years old council decision 
> >> applies or not here, my point was, and still is, that such council 
> >> decisions make me think you're confusing what *you* want and 
> >> what *we* (as 
> >> a project) want for this case
> >
> > i see no significant number of people clamoring for this as the default.
> > the bug that started this has everyone on board for changing the default.
> 
> yes; I also tend to think fedora's usr move is what makes most sense 
> nowadays, but that'd go against council

No, it wouldn't. We made a decision in 2013 (I'll have to find it) that
separate /usr should only be supported via initramfs; there is also a
news item warning that if you are not using initramfs and you have
separate /usr your system will be unbootable in the future.

> 
> > it's really no different either from the install process today: a stage3
> > cannot be unpacked & booted directly.  a user must configure it before it
> > can actually be used.  if that means enabling USE=sep-usr, then so be it.
> 
> except it adds yet another step
> 
> > there's no reason to force this legacy behavior on the majority of people
> > when a split-/usr is uncommon.
> 
> what's the reason not to force it? saving 10kb from ldscripts out of a 1Gb 
> typical desktop install ? doesnt seem like a reason for disabling it either
> 

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[William Hubbs]

[-- Attachment #1: Type: text/plain, Size: 2256 bytes --]

On Sat, Apr 02, 2016 at 12:35:58PM -0500, William Hubbs wrote:
> On Fri, Apr 01, 2016 at 09:36:56PM +0200, Alexis Ballier wrote:
> > On Friday, April 1, 2016 8:33:02 PM CEST, Mike Frysinger wrote:
> > > On 01 Apr 2016 20:00, Alexis Ballier wrote:
> > >> On Friday, April 1, 2016 3:58:18 AM CEST, Mike Frysinger wrote:
> > >>>> ...
> > >>> "being supported" != "enabled by default".  so no, i still don't see any
> > >>> requirement in anything you've cited that this be turned on 
> > >>> by default. ...
> > >> 
> > >> you're right, but you know, before you claimed the contrary of what was 
> > >> voted and then decided to argue whether a 4 years old council decision 
> > >> applies or not here, my point was, and still is, that such council 
> > >> decisions make me think you're confusing what *you* want and 
> > >> what *we* (as 
> > >> a project) want for this case
> > >
> > > i see no significant number of people clamoring for this as the default.
> > > the bug that started this has everyone on board for changing the default.
> > 
> > yes; I also tend to think fedora's usr move is what makes most sense 
> > nowadays, but that'd go against council
> 
> No, it wouldn't. We made a decision in 2013 (I'll have to find it) that
> separate /usr should only be supported via initramfs; there is also a
> news item warning that if you are not using initramfs and you have
> separate /usr your system will be unbootable in the future.

Here are the latest council decision on the matter [1] and news item [2].
At this point, if anyone who has split /usr isn't using initramfs,
they are operating on borrowed time.

I would agree, since it has been so long, that we should do another news
item, but once the news item is done and we give a firm date, I think
we should just kill off gen_usr_ldscript.

The /usr merge is a separate issue, which I agree with as well, but that
was never brought to council, and it is controversial in the Gentoo camp
because some folks claim fhs doesn't allow it.

William

[1]
https://projects.gentoo.org/council/meeting-logs/20130924-summary.txt
[2]
https://gitweb.gentoo.org/data/gentoo-news.git/plain/2013-09-27-initramfs-required/2013-09-27-initramfs-required.en.txt

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

Re: [gentoo-dev] [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Alexis Ballier]

On Saturday, April 2, 2016 8:01:39 PM CEST, William Hubbs wrote:
> On Sat, Apr 02, 2016 at 12:35:58PM -0500, William Hubbs wrote:
>> On Fri, Apr 01, 2016 at 09:36:56PM +0200, Alexis Ballier wrote:
>>> On Friday, April 1, 2016 8:33:02 PM CEST, Mike Frysinger wrote: ...
>> 
>> No, it wouldn't. We made a decision in 2013 (I'll have to find it) that
>> separate /usr should only be supported via initramfs; there is also a
>> news item warning that if you are not using initramfs and you have
>> separate /usr your system will be unbootable in the future.
>
> Here are the latest council decision on the matter [1] and news item [2].
> At this point, if anyone who has split /usr isn't using initramfs,
> they are operating on borrowed time.


Good then, thanks. I didn't remember this one and failed to see it when 
looking at council decisions. I assume there's nothing preventing disabling 
gen_usr_ldscript by default then. Apologies to Mike for being annoying on 
this one :)

I also assumed making eudev default was a step in having sep-usr work by 
default as the initial issue was brought up by udev, but that's flawed 
reversed logic.

> I would agree, since it has been so long, that we should do another news
> item, but once the news item is done and we give a firm date, I think
> we should just kill off gen_usr_ldscript.

Killing it is too violent IMHO: It doesn't provide much gain and makes it 
very annoying to get sep-usr working afterwards. I think current proposal 
to make it optional is the best option.

> The /usr merge is a separate issue, which I agree with as well, but that
> was never brought to council, and it is controversial in the Gentoo camp
> because some folks claim fhs doesn't allow it.

Getting a bit OT, but can you explain in what ways it violates fhs ?
What worries me more about /usr merge is that I've never seen a plan for 
it. I think it'd be necessary to have portage gain some intra-package 
collision check (e.g. a package installing /bin/foo and /usr/bin/foo should 
be reported), which would then allow building /usr-merged stages, but the 
main issue for me is how to migrate installed systems properly.

Alexis.

[gentoo-dev] /usr merge Was: [PATCH 00/21] gen_usr_ldscript: migrate away from a sep-/usr by default

[Duncan]

Alexis Ballier posted on Mon, 04 Apr 2016 09:12:16 +0200 as excerpted:

>> The /usr merge is a separate issue, which I agree with as well, but
>> that was never brought to council, and it is controversial in the
>> Gentoo camp because some folks claim fhs doesn't allow it.
> 
> Getting a bit OT, but can you explain in what ways it violates fhs ?
> What worries me more about /usr merge is that I've never seen a plan for
> it. I think it'd be necessary to have portage gain some intra-package
> collision check (e.g. a package installing /bin/foo and /usr/bin/foo
> should be reported), which would then allow building /usr-merged stages,
> but the main issue for me is how to migrate installed systems properly.

FWIW, I actually run a (reverse) merged /usr here, along with the bin/sbin 
merge.

Obviously it's symlinks as the packages still install where they will 
install, but:

/usr -> .
/sbin -> bin

As a result I have the following "semi-flattened" directory structure 
directly on /, including everything that would normally be under /usr:

/bin
/boot
/dev
/etc
/games -> .
/home
/include
/lib -> /lib64
/lib64
/libexec
/local
/media
/proc
/root
/run
/sbin -> bin
/share
/src
/srv
/sys
/tmp
/usr -> .
/var
/x86_64-pc-linux-gnu

(That excludes some unrelated additional changes of my own, again mostly 
to shorten paths, such as /home actually being /home -> /h (/h being the 
actual mountpoint for what would normally be /home in fstab), /local, 
what would be /usr/local, actually being /local -> /l, and /var/log -> /
lg (with /lg being a mountpoint as well, isolating logs and keeping 
runaway logging from creating havoc on anything but /lg itself).)


You will be glad to note that portage has in fact been smart enough to 
avoid symlinks overwriting the files they would normally point at for 
quite some time -- in fact, I specifically asked about this on the 
portage list before I tried it myself.  So that's not a problem at all.

There are, however, occasional bugs when specific packages try to clean 
up old versions and end up deleting the new version instead, because they 
don't dereference symlinks to a canonical path before they do the rm.  
One current example of that is gcc-config:

[Bug 554334] sys-devel/gcc-config pkg-postinst rm -f /usr/sbin/gcc-config 
breaks when using /usr/sbin->bin symlinks

https://bugs.gentoo.org/show_bug.cgi?id=554334

The result of that bug is that gcc-config deletes its own executable.  
However, it's worth repeating that the bug is because the ebuild itself 
executes rm -f on an arbitrary path without resolving both it and the 
canonical path of its executable and comparing them -- it's not a bug in 
portage itself, portage itself behaves correctly in terms of resolving to 
canonical paths.

Fortunately for me, while that bug has been open for 8 months+, my sync 
script can automatically patch ebuilds using patches in /etc/portage/
patches.ebuild, much like the portage implementation of eapply_user 
patches sources with patches found in /etc/portage/patches.  So now I've 
worked around that bug by patching out the offending rm line in the 
ebuild.  Hey, when eight months and counting later a critical bug in a 
toolchain package remains open, a good gentooer tends to find 
workarounds.  What can I say?


Packages that use cmake can sometimes have issues too, depending on the 
version of cmake, as it apparently doesn't always properly resolve to 
canonical paths.  As I'm a kde5/plasma user and one such affected package 
has been baloo, a plasma dependency, that has been a headache for me.  
But being a USE=-semantic-desktop user in the kde4 era, I didn't really 
want baloo on my system anyway, so rather than spend the time researching 
how to fix the bad cmake/symlinks interaction, I was motivated to 
research killing the baloo deps instead, and ultimately source-patched 
(as opposed to ebuild-patched, as I did gcc-config) the two plasma 
packages requiring it to kill the baloo-based modules.  With the sources 
patched to no longer require baloo, I simply placed a baloo null-package 
in my overlay (the other alternatives would be package.provided, but 
that's deprecated, or to use the ebuild patching sync-script mentioned 
above to delete the baloo-deps in the ebuild) to fill the ebuild 
dependency, and that's what I'm running with today.

The merged /usr and bin/sbin cmake related bugs I've filed are:

cmake/baloo: https://bugs.gentoo.org/show_bug.cgi?id=561956

(Unrelated to /usr or bin/sbin merge but mentioned above as my resolution 
for the cmake/baloo bug, the no-baloo patches bug:
https://bugs.gentoo.org/show_bug.cgi?id=578664 )

Older cmake/libraw bug, resolved with newer versions of one or the other: 
https://bugs.gentoo.org/show_bug.cgi?id=532426

Older plasma5 plasma-desktop bug that kept the plasma5 desktop from 
coming up properly, as I was switching to it from kde/plasma4, so I'm not 
sure if it was a regression from earlier plasma5 or not.  Fixed in 
current plasma: https://bugs.gentoo.org/show_bug.cgi?id=570210

IIRC I had one other /usr or bin/sbin related bug a couple years ago 
shortly after I first did the merge, but IDR what it was well enough to 
search my bugmail archive for it and get a link.

With nearly 1000 packages installed and 316 listed in various sets found 
in my world_sets file, that's all the /usr and bin/sbin merge bugs I've 
seen in what I'd guess to be two years plus of running merged, so it's 
obviously not a common problem at all.

And of course if gentoo more officially supported the /usr and bin/sbin 
merges, I'd have probably never seen half those bugs, as they'd have been 
caught before I ever saw them, even on ~arch.  Tho of course there'd be 
other bugs filed by others, for packages I don't have installed here.

But a merge-related bug is still relatively rare.  It's gotta be less 
than half the bugs I file and I'd guess 20% or less, and my setup is rare 
enough that were it mainstream, most users, certainly by stable, would be 
unlikely to ever see a /usr or bin/sbin merge related bug at all.

-- 
Duncan - List replies preferred.   No HTML msgs.
"Every nonfree program has a lord, a master --
and if you use the program, he is your master."  Richard Stallman