From da0b26a77ff60ba2b899b6d76a454265cf0fa7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 19 Mar 2018 07:03:57 +0100
Subject: Revert "Another fix"

This reverts commit 0644c4cc1b33aadb2875b924bc5364394414246d.

Revert "Fix previous commit"

This reverts commit 9b4429251d03ecccea41b02c2bcd7e849698f626.

Revert "Fix libraries in myinitramfs"

This reverts commit b674bd50459d7210ed2891a1e54b525339649403.
---
 sys-boot/myinitramfs/files/list                |  5 +--
 sys-boot/myinitramfs/myinitramfs-1.2-r2.ebuild | 46 ++++++++++++++++++++++++++
 sys-boot/myinitramfs/myinitramfs-1.3-r1.ebuild | 46 --------------------------
 3 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 sys-boot/myinitramfs/myinitramfs-1.2-r2.ebuild
 delete mode 100644 sys-boot/myinitramfs/myinitramfs-1.3-r1.ebuild

diff --git a/sys-boot/myinitramfs/files/list b/sys-boot/myinitramfs/files/list
index 636ce21..9645521 100644
--- a/sys-boot/myinitramfs/files/list
+++ b/sys-boot/myinitramfs/files/list
@@ -29,10 +29,7 @@ file /lib64/librt.so.1	/lib64/librt.so.1	755 0 0
 file /lib64/libudev.so.1	/lib64/libudev.so.1	755 0 0
 file /lib64/libuuid.so.1	/lib64/libuuid.so.1	755 0 0
 file /lib64/libz.so.1	/lib64/libz.so.1	755 0 0
-file /lib64/libzstd.so.1	/usr/lib64/libzstd.so.1	755 0 0
+file /lib64/libcryptsetup.so.4	/usr/lib64/libcryptsetup.so.4	755 0 0
 file /lib64/libgcrypt.so.20	/usr/lib64/libgcrypt.so.20	755 0 0
 file /lib64/libgpg-error.so.0	/usr/lib64/libgpg-error.so.0	755 0 0
 file /lib64/libpopt.so.0	/usr/lib64/libpopt.so.0	755 0 0
-file /lib64/libcryptsetup.so.12	/usr/lib64/libcryptsetup.so.12 755 0 0
-file /lib64/libargon2.so.1	/usr/lib64/libargon2.so.1	755 0 0
-file /lib64/libjson-c.so.3	/usr/lib64/libjson-c.so.3	755 0 0
diff --git a/sys-boot/myinitramfs/myinitramfs-1.2-r2.ebuild b/sys-boot/myinitramfs/myinitramfs-1.2-r2.ebuild
new file mode 100644
index 0000000..ebdc6c5
--- /dev/null
+++ b/sys-boot/myinitramfs/myinitramfs-1.2-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO support encrytion and btrfs only as option
+
+EAPI=6
+
+VER="${PV%-r*}"
+
+DESCRIPTION="My personal initramfs (verry simple with encryption support)"
+S="${WORKDIR}/myinitramfs-${VER}"
+
+LICENSE="GPLv2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+encrypted"
+
+DEPEND="sys-fs/cryptsetup
+sys-fs/btrfs-progs
+sys-apps/linux-misc-apps
+sys-apps/busybox[static]"
+RDEPEND="${DEPENDS}
+sys-kernel/linux[initramfs]"
+
+src_unpack() {
+	# Well we have no sources so just create empty directory
+	mkdir -p "${S}"
+}
+
+src_compile() {
+	# TODO generate list dynamically
+	cp "${FILESDIR}"/list list
+	if use encrypted; then
+		echo "file /init ${FILESDIR}/init.enc 755 0 0" >> list
+	else
+		echo "file /init ${FILESDIR}/init.plain 755 0 0" >> list
+	fi
+	gen_init_cpio list > initramfs.cpio
+	gzip initramfs.cpio
+}
+
+src_install() {
+	dodir /boot
+	insinto /boot
+	newins initramfs.cpio.gz initramfs-gentoo
+}
diff --git a/sys-boot/myinitramfs/myinitramfs-1.3-r1.ebuild b/sys-boot/myinitramfs/myinitramfs-1.3-r1.ebuild
deleted file mode 100644
index ebdc6c5..0000000
--- a/sys-boot/myinitramfs/myinitramfs-1.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO support encrytion and btrfs only as option
-
-EAPI=6
-
-VER="${PV%-r*}"
-
-DESCRIPTION="My personal initramfs (verry simple with encryption support)"
-S="${WORKDIR}/myinitramfs-${VER}"
-
-LICENSE="GPLv2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+encrypted"
-
-DEPEND="sys-fs/cryptsetup
-sys-fs/btrfs-progs
-sys-apps/linux-misc-apps
-sys-apps/busybox[static]"
-RDEPEND="${DEPENDS}
-sys-kernel/linux[initramfs]"
-
-src_unpack() {
-	# Well we have no sources so just create empty directory
-	mkdir -p "${S}"
-}
-
-src_compile() {
-	# TODO generate list dynamically
-	cp "${FILESDIR}"/list list
-	if use encrypted; then
-		echo "file /init ${FILESDIR}/init.enc 755 0 0" >> list
-	else
-		echo "file /init ${FILESDIR}/init.plain 755 0 0" >> list
-	fi
-	gen_init_cpio list > initramfs.cpio
-	gzip initramfs.cpio
-}
-
-src_install() {
-	dodir /boot
-	insinto /boot
-	newins initramfs.cpio.gz initramfs-gentoo
-}
-- 
cgit v1.2.3