[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     b10038f9a6499045ae001c99921be6ea81fba4a4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 07:52:26 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 08:03:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10038f9

sys-apps/nix: drop old

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-apps/nix/Manifest         |   2 -
 sys-apps/nix/nix-2.0.4.ebuild | 143 ------------------------------------------
 sys-apps/nix/nix-2.1.3.ebuild | 142 -----------------------------------------
 3 files changed, 287 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 5f5d2661d76..61c8f635ed0 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,2 @@
-DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.1.3.tar.xz 816396 BLAKE2B 9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760 SHA512 d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 DIST nix-2.2.2.tar.xz 818408 BLAKE2B f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079 SHA512 c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
 DIST nix-2.3.tar.xz 844640 BLAKE2B 09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096 SHA512 45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425

diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
deleted file mode 100644
index 26192138b60..00000000000
--- a/sys-apps/nix/nix-2.0.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	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}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-2.0-user-path.patch
-	"${FILESDIR}"/${PN}-2.0.4-bdwgc-8.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() {
-	local econf_args=()
-
-	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) \
-		"${args[@]}"
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-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.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
deleted file mode 100644
index d6e2b56ec29..00000000000
--- a/sys-apps/nix/nix-2.1.3.ebuild
+++ /dev/null
@@ -1,142 +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"
-
-RDEPEND="
-	app-arch/brotli
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-db/sqlite
-	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}-1.11.6-systemd.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-	"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-	"${FILESDIR}"/${PN}-2.0-user-path.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() {
-	local econf_args=()
-
-	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) \
-		"${args[@]}"
-}
-
-src_compile() {
-	local make_vars=(
-		OPTIMIZE=0 # disable hardcoded -O3
-		V=1 # verbose build
-	)
-	emake "${make_vars[@]}"
-}
-
-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
-}