gentoo resync : 25.11.2020

3 files changed, 47 insertions, 3 deletions

diff --git a/sys-libs/libaal/Manifest b/sys-libs/libaal/Manifest
index 5da9d002c95e..17b63b20778a 100644
--- a/sys-libs/libaal/Manifest
+++ b/sys-libs/libaal/Manifest
@@ -1,3 +1,4 @@
 DIST libaal-1.0.7.tar.gz 376068 BLAKE2B 2fb7802401721a64b17c0409f3ff668524399efc03b4bda4b4523af2cce204fdb5cf41bb2b2a6af5cbda34ee88cbb4703eec9bb76774d705b1759c91a33b1e34 SHA512 9b39a8cd3f49257ea912bb0e463c0c63ad06914e8a310deb4d4dce544d3ee34f492203c7321f971af71dddc1eb85f207082a4791b19bd4fad3f7dab516513b3d
-EBUILD libaal-1.0.7-r1.ebuild 853 BLAKE2B fcc789a010130a7cdb2f1b25b5744169e08a631b63e689c8932df4b2cbd326c8e5c016ed3b6274f7406f0d2e4dfd30c7fc9fe728909b925945600cafe2f03f24 SHA512 62b249c7b34a9b30654c910fc4fcca2f34edf5a14aa490e9a567b61aeef830873ebe15b98106c2303ad3e60fc49e8db6ade99dfbb3189a58eaac16e24b748c95
+EBUILD libaal-1.0.7-r1.ebuild 853 BLAKE2B 15e4af1abf762925174d00143fe5ca7ed2ee15cfd764da6c9dd6b10c0ac7538475dc1d66e546aee2f17af81dd948e1196f77558973796c5d491abc421bb6e386 SHA512 0749602dc24a50cd9b829de691d726a2f1e905fc8fa76a58bb9e9c4e905b115a86006edc9c7782e482732a92872dce4cc4da7afc10141d625bf9dbe70effe81c
+EBUILD libaal-1.0.7-r2.ebuild 907 BLAKE2B e1fb5f233bcab87ba3bd72286bad8870cd943d8bb77d0e52047628e7089f3a77ffdb303a123574ee650b1f049112d8765e7c50c724e150b6fba86196b230d064 SHA512 ac7487e0b9a3fe04822608808b3f034578867ab22a3eddf7a2c0f71c6601c96fa48b1be36365bbc70cbd556235ec57720a69ba9a2f9fa4d7687e1649ee84356b
 MISC metadata.xml 493 BLAKE2B ccc5d79189bac603eaec22245f68952afbed30677759278dd3078b1af4c15358ee945b7f20c9e5b0210e04e989d5e784d4780a69516e9647aec87a47e5bb39d3 SHA512 ec9eee8ae224303648bd688c0309cc8809cb2dd0d80aa1fe77d7a039a0258aa4288745e9cd191ac2c70de64160cb62c47f43983ef852f171044ad39f5a5120df
diff --git a/sys-libs/libaal/libaal-1.0.7-r1.ebuild b/sys-libs/libaal/libaal-1.0.7-r1.ebuild
index c0bf7d825e9a..8b3acfa242dc 100644
--- a/sys-libs/libaal/libaal-1.0.7-r1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.7-r1.ebuild
@@ -21,8 +21,8 @@ src_prepare() {
 
 	# remove stupid CFLAG hardcodes
 	sed -i \
-		-e "/GENERIC_CFLAGS/s:-O3::" \
-		-e "/^CFLAGS=/s:\"\":\"${CFLAGS}\":" \
+		-e "/GENERIC_CFLAGS/s@-O3@@" \
+		-e "/^CFLAGS=/s@\"\"@\"${CFLAGS}\"@" \
 		configure || die
 	printf '#!/bin/sh\n:\n' > run-ldconfig || die
 }
diff --git a/sys-libs/libaal/libaal-1.0.7-r2.ebuild b/sys-libs/libaal/libaal-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..0fd56b9723d6
--- /dev/null
+++ b/sys-libs/libaal/libaal-1.0.7-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs usr-ldscript
+
+DESCRIPTION="library required by reiser4progs"
+HOMEPAGE="https://sourceforge.net/projects/reiser4/"
+SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/7"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+IUSE="static-libs"
+
+BDEPEND="virtual/os-headers"
+
+src_prepare() {
+	default
+
+	# remove stupid CFLAG hardcodes
+	sed -i \
+		-e "/GENERIC_CFLAGS/s@-O3@@" \
+		-e "/^CFLAGS=/s@\"\"@\"${CFLAGS}\"@" \
+		configure || die
+	printf '#!/bin/sh\n:\n' > run-ldconfig || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-libminimal
+		--enable-memory-manager
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a aal{,-minimal}
+	find "${ED}" -type f -name "*.la" -delete || die
+}