gentoo resync : 15.01.2020

9 files changed, 0 insertions, 574 deletions

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
deleted file mode 100644
index 8328c2f2d993..000000000000
--- a/sys-apps/nix/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232
-AUX nix-2.3-bootstrap.patch 1688 BLAKE2B 4bcb38019f1d310a8a888a76009942986881e426f030b626dbeeba1ece37f2e0c94fc2f44f37535bc89a1b946979cd827e33c5d407896989a9771bffa0a90143 SHA512 3f23dfc1941c848d7ef82c1990f0eed946241f6f331bd85f511ed72096b2685a285e2c2248fb30499376f3a80fa19e411543819d16a4fae732dd0ae98bb55236
-AUX nix-2.3-libpaths.patch 2856 BLAKE2B 06f6dba50811e353908e5faad56671e433c88a8054a4f0056c6b24930bfc7747baf8f138db64c8da0a0e73847568277238801f0a13436f38ca78e3037092fc82 SHA512 aac5f322f6a0565e4d38c272e51c49a31b9388b9ac29ee3aae509630e8fc1c7f02a726bc60a1d3c8400768b84f93088cc59d88f2cec79ae86814dba501bc72b7
-AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d
-DIST nix-2.3.1.tar.xz 844608 BLAKE2B a5c8e97aad8bd8dea644f8aa04665cc078a69c7203891c469900ca1b1450a5714281209235bcaedbc6f3f128e0c11aff41850f3b0815ef657e13de3364ff0188 SHA512 791c377082cf8dd17a24d927caa4127eeb20bd03d479424861928437eb352cb4650beb7f36d92d85ce6a7404f4fbfc5a36a342d09061e88dbafd1b51463eb15f
-DIST nix-2.3.tar.xz 844640 BLAKE2B 09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096 SHA512 45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425
-EBUILD nix-2.3-r1.ebuild 3272 BLAKE2B 1c424c2719280ed7fbce7afdb78ca4be1ccfef87482d03b65dfe00ec4d94468c07e6da002cf5a3b0505947738c8cd9cff01190a5b1421797727d7685641ae8f2 SHA512 4f50b81aea9ca9a7273e1034f1c75f73b1d656dac3e37d09d4c3ae71307a772f3025fe9e6d38619fb0cc096d51d35594289f6c035efe5fb102a0576f8759af08
-EBUILD nix-2.3.1.ebuild 3424 BLAKE2B 1e34b36fd1331a69d905873c816b9357b3355bc7fb1b314827690a28816d7aca00195585a4b9694261594b1a49e4182cdeffa7210f5c420a86a57dab4cefac7d SHA512 847a6d575d1bfe930db2a0d62818b1f3299877385ad7ae267646da8204c50b972434cbc2022a29cf68df02da1e2e4ad92181f49ea66bd95da589af2e2ee610d9
-EBUILD nix-2.3.ebuild 3231 BLAKE2B b2e5f42f29ffae7562682a41dbb91f29472cd765c0a63731b35fe2cb2d9da301fcba5e6b88722e4a6de5cce31c1cd0f0cf7a7e58fc1b61ffc581a3434260208e SHA512 d762b40003a6aff5f2d5b8080d22e9f8570e747a4a66fe2415d91e6089b44a58a6dc916c0caa6d8fd89bad7a14191c31635306deb7560193485b7a8f2c48a645
-MISC metadata.xml 681 BLAKE2B 54f534400a087cee24ffe30820268dfff9a3bc479ba287ef3d0a9049028938bbc6f07572a436c190226d04f37e5459ff0cd994c438a2664f12c211fb6773b4ad SHA512 94aa8dd9b21a2303c3844ac2d6e86812b4b764c2507ce1c237d31f5663b216c0df6d81669f824eb11d28706364b996f722c5768cbe707e3c4b3169bd6e84ac87
diff --git a/sys-apps/nix/files/nix-2.0-user-path.patch b/sys-apps/nix/files/nix-2.0-user-path.patch
deleted file mode 100644
index 486a05bb5959..000000000000
--- a/sys-apps/nix/files/nix-2.0-user-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-On gentoo 'id' is /usr/bin/id while @coreutils@ is /bin.
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index a5f5227..1dc5379 100644
---- a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -2,3 +2,3 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
-     __savedpath="$PATH"
--    export PATH=@coreutils@
-+    export PATH=@coreutils@:@prefix@/bin:@prefix@/../bin
- 
diff --git a/sys-apps/nix/files/nix-2.3-bootstrap.patch b/sys-apps/nix/files/nix-2.3-bootstrap.patch
deleted file mode 100644
index fd656e0a1ecc..000000000000
--- a/sys-apps/nix/files/nix-2.3-bootstrap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fix `nix-channel --update` does not work on freshly-installed nix.
-
-# Why it does not work by default
-
-`nix-channel --update` does two main things:
-1. fetch new tarball with nix expressions
-2. unpack that tarball as part of the build system using
-   a shell script derived by unpack-channel.nix.
-3. install the result into /nix/store
-
-
-[2.] fails because tarball unpacking runs in a sandboxed environment
-a container with /nix/store and /bin/sh mounted.
-
-unpack-channel.nix needs bash, tar and xz binaries in PATH.
-These are normally provided by bash, tar and xz packages from /nix/store.
-
-Unfortunately bash, tar and xz packages are not yet fetched as we
-only have nix installed without nixpkgs tree.
-
-# How we get it working
-
-1. we patch unpack-channel.nix to only require 'sh'
-2. we use /bin/sh as a static busybox and point nix at it:
-   ./configure --with-sandbox-shell=/bin/busybox
-
-Bug: https://bugs.gentoo.org/693482
-Bug: https://github.com/NixOS/nix/issues/2673
---- a/corepkgs/unpack-channel.nix
-+++ b/corepkgs/unpack-channel.nix
-@@ -6,15 +6,9 @@ let
-     ''
-       mkdir $out
-       cd $out
--      xzpat="\.xz\$"
--      gzpat="\.gz\$"
--      if [[ "$src" =~ $xzpat ]]; then
--        ${xz} -d < $src | ${tar} xf - ${tarFlags}
--      elif [[ "$src" =~ $gzpat ]]; then
--        ${gzip} -d < $src | ${tar} xf - ${tarFlags}
--      else
--        ${bzip2} -d < $src | ${tar} xf - ${tarFlags}
--      fi
-+
-+      tar xf $src
-+
-       if [ * != $channelName ]; then
-         mv * $out/$channelName
-       fi
-@@ -26,7 +20,7 @@ in
- 
- derivation {
-   system = builtins.currentSystem;
--  builder = shell;
-+  builder = "/bin/sh";
-   args = [ "-e" builder ];
-   inherit name channelName src;
- 
diff --git a/sys-apps/nix/files/nix-2.3-libpaths.patch b/sys-apps/nix/files/nix-2.3-libpaths.patch
deleted file mode 100644
index 42931e7e8d5f..000000000000
--- a/sys-apps/nix/files/nix-2.3-libpaths.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Workaround -L path order by passing local library paths before
-systemwide paths to avoid pulling libnixstore.so from system
-instead of locally-built library.
-
-The patch is not perfect because it passes LDFLAGS after local
-libraries but it makes nix link correctly.
-
-Bug: https://github.com/NixOS/nix/issues/3087
---- a/mk/libraries.mk
-+++ b/mk/libraries.mk
-@@ -91,7 +91,7 @@ define build-library
-     $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT)
- 
-     $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
-+	$$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED)
- 
-     ifneq ($(OS), Darwin)
-       $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
-@@ -105,7 +105,7 @@ define build-library
-     $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
- 
-     $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ -shared $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED)
- 
-     $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
-     ifneq ($(OS), Darwin)
---- a/mk/programs.mk
-+++ b/mk/programs.mk
-@@ -32,7 +32,7 @@ define build-program
-   $$(eval $$(call create-dir, $$(_d)))
- 
-   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
--	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
-+	$$(trace-ld) $(CXX) -o $$@ $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS)
- 
-   $(1)_INSTALL_DIR ?= $$(bindir)
-   $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1)
-@@ -46,7 +46,7 @@ define build-program
-     _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
- 
-     $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/
--	$$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
-+	$$(trace-ld) $(CXX) -o $$@ $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS)
- 
-   else
- 
diff --git a/sys-apps/nix/files/nix-daemon.initd b/sys-apps/nix/files/nix-daemon.initd
deleted file mode 100644
index 1fd42734c0a8..000000000000
--- a/sys-apps/nix/files/nix-daemon.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet --background --exec /usr/bin/nix-daemon
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet --exec /usr/bin/nix-daemon
-	eend ${?}
-}
diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
deleted file mode 100644
index ebcafee28dab..000000000000
--- a/sys-apps/nix/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<use>
-		<flag name="etc-profile">Install /etc/profile.d/ entry to inject nix support for all users.</flag>
-		<flag name="gc">Enable garbage collection in the Nix expression evaluator (use <pkg>dev-libs/boehm-gc</pkg>).</flag>
-		<flag name="s3">Enable Amazon S3 bucket to load and store packages (use <pkg>dev-libs/aws-sdk-cpp</pkg>).</flag>
-		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/nix/nix-2.3-r1.ebuild b/sys-apps/nix/nix-2.3-r1.ebuild
deleted file mode 100644
index 30e6c06b9449..000000000000
--- a/sys-apps/nix/nix-2.3-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-apps/busybox[static]
-	dev-db/sqlite
-	dev-libs/editline:0=
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	s3? ( dev-libs/aws-sdk-cpp )
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-	"${FILESDIR}"/${PN}-2.3-libpaths.patch
-	"${FILESDIR}"/${PN}-2.3-bootstrap.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use s3; then
-		# Disable automagic depend: bug #670256
-		export ac_cv_header_aws_s3_S3Client_h=no
-	fi
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc) \
-		--with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc-profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc-profile; then
-		ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc-profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.3.1.ebuild b/sys-apps/nix/nix-2.3.1.ebuild
deleted file mode 100644
index df8590b23b50..000000000000
--- a/sys-apps/nix/nix-2.3.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-apps/busybox[static]
-	dev-db/sqlite
-	dev-libs/editline:0=
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	s3? ( dev-libs/aws-sdk-cpp )
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-libpaths.patch
-	"${FILESDIR}"/${PN}-2.3-bootstrap.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_pretend() {
-	# USER_NS is used to run builders in a default setting in linux:
-	#     https://nixos.wiki/wiki/Nix#Sandboxing
-	local CONFIG_CHECK="~USER_NS"
-	check_extra_config
-}
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use s3; then
-		# Disable automagic depend: bug #670256
-		export ac_cv_header_aws_s3_S3Client_h=no
-	fi
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc) \
-		--with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc-profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc-profile; then
-		ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc-profile)."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/sys-apps/nix/nix-2.3.ebuild b/sys-apps/nix/nix-2.3.ebuild
deleted file mode 100644
index 2a368774542b..000000000000
--- a/sys-apps/nix/nix-2.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix"
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	sys-apps/busybox[static]
-	dev-db/sqlite
-	dev-libs/editline:0=
-	dev-libs/openssl:0=
-	>=dev-libs/boost-1.66:0=[context]
-	net-misc/curl
-	sys-libs/libseccomp
-	sys-libs/zlib
-	gc? ( dev-libs/boehm-gc[cxx] )
-	doc? ( dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-	)
-	s3? ( dev-libs/aws-sdk-cpp )
-	sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-2.6
-	>=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-	"${FILESDIR}"/${PN}-2.3-libpaths.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-	[systemd] # systemctl enable nix-daemon
-	[openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-	\$ nix-channel --update
-[as a user] install nix packages:
-	\$ nix-env -i mc
-[as a user] configure environment:
-	Somewhere in .bash_profile you might want to set
-	LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-	but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-	nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-	enewgroup nixbld
-	for i in {1..10}; do
-		# we list 'nixbld' twice to
-		# both assign a primary group for user
-		# and add a user to /etc/group
-		enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-	done
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if ! use s3; then
-		# Disable automagic depend: bug #670256
-		export ac_cv_header_aws_s3_S3Client_h=no
-	fi
-	econf \
-		--localstatedir="${EPREFIX}"/nix/var \
-		$(use_enable gc) \
-		--with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# TODO: emacs highlighter
-	default
-
-	readme.gentoo_create_doc
-
-	# here we use an eager variant of something that
-	# is lazily done by nix-daemon and root nix-env
-
-	# TODO: will need a tweak for prefix
-	keepdir             /nix/store
-	fowners root:nixbld /nix/store
-	fperms 1775         /nix/store
-
-	keepdir             /nix/var/nix/channel-cache
-	fperms 0777         /nix/var/nix/channel-cache
-
-	keepdir             /nix/var/nix/profiles/per-user
-	fperms 1777         /nix/var/nix/profiles/per-user
-
-	# setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
-	keepdir             /nix/var/nix/gcroots/per-user
-	fperms 1777         /nix/var/nix/gcroots/per-user
-
-	newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-	if ! use etc-profile; then
-		rm "${ED}"/etc/profile.d/nix.sh || die
-		rm "${ED}"/etc/profile.d/nix-daemon.sh || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use etc-profile; then
-		ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to USE=-etc-profile)."
-	fi
-
-	readme.gentoo_print_elog
-}