8 files changed, 84 insertions, 8 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 96b4e7b2a833..59e958dffa43 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 42c305c2ecbf..a6f084fc5b15 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -7,7 +7,7 @@ AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f3
 DIST apparmor-3.0.10.tar.gz 7967601 BLAKE2B 8fa094dac6140949cecad8fdf056c6e119291d9490404b0c7379e14d85eff8d6424ec5099e04184424c271b83bb5893389e4023a2946b8296268559f13d20c20 SHA512 94866c3151e6776b9efbbf3852a48e19908ddbc1f3156df1e1bf0b8a79be49b4eba96ce3725a3cf10af3affa00f9a045bbab06ffd3d668c80039eb369b3f6762
 DIST apparmor-3.0.8.tar.gz 7946880 BLAKE2B bbff6c0223b9f20cb53d96cb2e41aa4b7eee51b35a2c010cdd394f85517e87c9a34fb7182f600ba212e99baf4ee1a16a5bfd7e92ec6a9fb9ce6076a216cd89e1 SHA512 539e955b24c6f4f62ef0d7885fc341e4f6bc69ee840981426fb6a40f8f8e5c945f774246cb0efe1a76e778b8047d4a7fe315ab062d2dbe17e524b8527d5a8087
 DIST apparmor-3.1.4.tar.gz 7965268 BLAKE2B a9be29a42bb96c1d2c69a6b7627d59aea023f22fe79bff1a487aa5ddd6845ec98f67be5c597ec51edf4493513dfed3b43fc493f454bcf48b3f43c44572ffc2ae SHA512 db65edfa1b9c1f953940165e71dddcab9a2d378f29683b0b4e5d44f0810bb0105ba3820ba89de927ef90d0a94ea6d61e91ce3de09ec2e385817735a93d4039c4
-EBUILD apparmor-3.0.10.ebuild 1876 BLAKE2B 0fececbd95fde353e39d2c94521102be0efdaa65df9b706c60b6bfca6d9108449826455c8585a170cfb5158e4ef43b59c66ee8016bbdc80a7067e390b3bb1146 SHA512 45cd732a412a10125f7574f78467cdd19ca5c524eacd4c0ce463ba2f887af4f0e8b979b3f51a2b4f8f2c2c54eff7b41b2511db0149b4e8d8d32bc4b2101248a7
-EBUILD apparmor-3.0.8.ebuild 1876 BLAKE2B 0fececbd95fde353e39d2c94521102be0efdaa65df9b706c60b6bfca6d9108449826455c8585a170cfb5158e4ef43b59c66ee8016bbdc80a7067e390b3bb1146 SHA512 45cd732a412a10125f7574f78467cdd19ca5c524eacd4c0ce463ba2f887af4f0e8b979b3f51a2b4f8f2c2c54eff7b41b2511db0149b4e8d8d32bc4b2101248a7
-EBUILD apparmor-3.1.4.ebuild 1883 BLAKE2B f499867f6a29e16d0639343c835793e20261a2cc1135ee707a458d3a55adcb0fd3fe0b42d503c52cec17280fa87fb67e79f65fc537cca82d5d09bd3719b7a5f7 SHA512 827ec9503045a1674761d76e7852eab59c695d971896ba52e14737a506f603889bb2afa7ef9aa90afbf6c1d446f40e6a2bb00183661a546bae213164121cc9ec
+EBUILD apparmor-3.0.10.ebuild 1964 BLAKE2B 26298f3de526d3b29611a057d12287f4d4f654a3f8ed39e2d101078482dbfe5cbe13731250a28c731fd3e711c56a53fdffb411c3bbb245cacdb3e99134da725e SHA512 2db991ea7a9fe5ed2f66c42f2c649f9036f505de1788f1ef83204852f6de09276be36dd29a1bcb51c831ba52dd2629fbc25fdb62249d39137f95cc554e7a3f05
+EBUILD apparmor-3.0.8.ebuild 1964 BLAKE2B 26298f3de526d3b29611a057d12287f4d4f654a3f8ed39e2d101078482dbfe5cbe13731250a28c731fd3e711c56a53fdffb411c3bbb245cacdb3e99134da725e SHA512 2db991ea7a9fe5ed2f66c42f2c649f9036f505de1788f1ef83204852f6de09276be36dd29a1bcb51c831ba52dd2629fbc25fdb62249d39137f95cc554e7a3f05
+EBUILD apparmor-3.1.4.ebuild 1971 BLAKE2B 2afd48d7351d26c14e4d87082d5a691dfaf1aacbc11f42f3d1646f5c4710948ac5e816211b38dab55e80e323e65468516000918bc3f3ac561ae90649f3d8a1a9 SHA512 ab8b8cdb511a31831f2e7cdebc1953e692cdebcb98a3047a32c370b003e355c6a851562746d451e7655e2b4987dea4ce4abea0e0e0d2dbe6ec8ce8cf8df7d6d7
 MISC metadata.xml 447 BLAKE2B 5a0652e06d0188fd13d419135d3ddaa5847afe0bb7ec161e39eec9e48ea4cd01f47014c8a1419ae9eab82ae77d93fcebdf6c5df0ca6a7a7af6daf3142aad4c51 SHA512 dcd66346915b14cf854be3c7b091704314279c1324f512f1d4b41c85a07a50f43390178685d3adde9d6931c12080d4e3a9240dd860799a8f81ffbd912afebcfd
diff --git a/sys-apps/apparmor/apparmor-3.0.10.ebuild b/sys-apps/apparmor/apparmor-3.0.10.ebuild
index 0ad9bb9bbc01..3bff9b266481 100644
--- a/sys-apps/apparmor/apparmor-3.0.10.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -51,6 +51,13 @@ src_prepare() {
 		-i ../common/list_af_names.sh || die
 }
 
+src_configure() {
+	# ODR violations (bug #863524)
+	filter-lto
+
+	default
+}
+
 src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
diff --git a/sys-apps/apparmor/apparmor-3.0.8.ebuild b/sys-apps/apparmor/apparmor-3.0.8.ebuild
index 0ad9bb9bbc01..3bff9b266481 100644
--- a/sys-apps/apparmor/apparmor-3.0.8.ebuild
+++ b/sys-apps/apparmor/apparmor-3.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -51,6 +51,13 @@ src_prepare() {
 		-i ../common/list_af_names.sh || die
 }
 
+src_configure() {
+	# ODR violations (bug #863524)
+	filter-lto
+
+	default
+}
+
 src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild b/sys-apps/apparmor/apparmor-3.1.4.ebuild
index 7e740c90b8c3..141029aefee8 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit systemd toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
 
@@ -51,6 +51,13 @@ src_prepare() {
 		-i ../common/list_af_names.sh || die
 }
 
+src_configure() {
+	# ODR violations (bug #863524)
+	filter-lto
+
+	default
+}
+
 src_compile() {
 	emake \
 		AR="$(tc-getAR)" \
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 1ff4ea0700e9..c4b1051b5f7d 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,5 +1,6 @@
 AUX sg3_utils-1.47-musl.patch 1238 BLAKE2B 557c29249c23afe8ee807e0cd168d3a502095e3eae0aeea006b37f8b2e8c2dd3530c37517e9dd4ec1aed2bf14707cbc2e1dc6f607f091130dbafa61ca2470b69 SHA512 5eeae68fbca737e127f43c83177adda5c4ad41d49ad6e4ebdb780d25f9eb1a516456e2f91ef20f95cb5dde63505c385b3bf514dcc56235369689f0736df0deef
 DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163
-EBUILD sg3_utils-1.47-r1.ebuild 1068 BLAKE2B 30bf13ce8de1ceb0599aef24e454cf1eb0dc8abf164b26eb1a9e28a2ba5545c088dd1e91e2344d2806cb867930715e6d356311698dc4f78b3a7e6661ac2a3e52 SHA512 01947bf69f628300b1541aad4c98f2f1ba8054badcfe6acdfb9b39460546fc1faebeb2e38ab58e3d7bebd4f60d7b10815cd2a383800ae4cbf60803ee8c5f96e8
+EBUILD sg3_utils-1.47-r1.ebuild 1099 BLAKE2B 788d1ca12c307c0c04e62ccf45ae0a973bc96a462bb929c4f84ab2909d044bdd73b7d75697caff6f86fddb4d8e1b9cd89af90540df3221ebf0a4efd9c71d9f63 SHA512 babb8cea1113e1ddc8bc27e62b76022ee7e7d2c648405d21087d18fde8cff860c7a384612b85719378c5b08ac94610ba4fab573b3f8e08f17182c0aee96347f7
+EBUILD sg3_utils-1.47-r2.ebuild 1107 BLAKE2B acedee0202acee09d9df32d7ce1aa0f355061df55131b7046d7ff609d80d412cb1caf50bd53ea2abe890947a76e77b7e969c30ba07df142d094b40bfe76f45c9 SHA512 31e6b1ad605a9e8ef6867b1fc9d6ec73d8f9ba251cab18423233b6e897ef5d55a2e7200d5ea3426f3f175961a012f889b6a350d4af24fdd6faab9df5a5283ab2
 EBUILD sg3_utils-1.47.ebuild 1003 BLAKE2B b2a2612b44aff3a0b5945098ec46d8f3d3e37d6b4460f0b6eb7ebf19492e2ede89500f0df0d52e1a2ac7b7792269a657e6d228d32bcf0f34b339508648b8288d SHA512 74b2d8a9598fbc454f5525d25e71b6a53fb2204269e8531e0fc8e8ab091484c2c04edf190e3966630a6158947011d98b6419a5c5418913c2e0151f5e134299a2
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
index 006572f48b94..000805d29a24 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit libtool
+
 DESCRIPTION="Apps for querying the sg SCSI interface"
 HOMEPAGE="https://sg.danny.cz/sg/"
 #SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -13,7 +15,6 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs"
 
-DEPEND="dev-build/libtool"
 RDEPEND="!sys-apps/rescan-scsi-bus"
 
 PATCHES=(
@@ -21,6 +22,11 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.47-musl.patch
 )
 
+src_prepare() {
+	default
+	elibtoolize
+}
+
 src_configure() {
 	econf $(use_enable static-libs static)
 }
diff --git a/sys-apps/sg3_utils/sg3_utils-1.47-r2.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47-r2.ebuild
new file mode 100644
index 000000000000..7713ea4da2c5
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.47-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit libtool
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="https://sg.danny.cz/sg/"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND="!sys-apps/rescan-scsi-bus"
+
+PATCHES=(
+	# Bug #828897
+	"${FILESDIR}"/${PN}-1.47-musl.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc COVERAGE doc/README examples/*.txt
+	newdoc scripts/README README.scripts
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+}