gentoo auto-resync : 29:12:2022 - 20:15:49

4 files changed, 229 insertions, 26 deletions

diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 2f931f5f295c..fb4129180207 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,9 +1,11 @@
 AUX ras-mc-ctl.openrc-r1 419 BLAKE2B 50239d64b95c1759a2fb88107b78875b9f6227c256c2a59628b33dfaf720c649e714afe24424f34e865d1fc46145daa8deda4e8612ef6c0d11ef1bf67b2c2e88 SHA512 f12c82432086bfdd0ee24a767b2c6dae9a50cb65038189bfdc2aff9447e5e734e1277d809ed3c7a55ac31034773983e1f46f466adabdd4e727b491c260c5c53e
 AUX rasdaemon-0.6.7-musl.patch 1032 BLAKE2B 4185df738abec830fe1fa202cf15b9e12fe4fa09056ffcc77be3189310526b4e1b1aa2c938f30493e6ad8626902d58ea2d1c8ee0398226ea315d51155b2c64e0 SHA512 17d83cd502e32f8ad70655dd9d94d2a6d4b0535054488b56decdeefeb83bbd5d314e0740f51ed3df198cee18c0e0c91462fe01dd3816c3f2a41e659aa7ad0f58
+AUX rasdaemon-0.6.8-bashisms-configure.patch 9566 BLAKE2B 8a59f4255ff37bda63047bacbecd6a90856f9fa8acc42f8fffec653e20161d0cd6ebde06c9d54004f9c81e17c3e18b8673345690af75604557a7d97d45b72149 SHA512 f8a98bd9c3cb1050f66207105fac80efd1a4ea7f1dcbe997d0f8f611d345eb1026c9d8a4923eef4240fd072fec99e9f1fcb0e2b46d85c053d3d5fcf7da4469b2
 AUX rasdaemon.confd 109 BLAKE2B 20f78ff36701aa718e5dcb36b79949ea5f887ddc65219c335dddabc3440007d91bc5b53ffc499aa6ca018dd8108a2ea841b8ae111b10877be2005cc8c1aca299 SHA512 9e240c3a4c2dd741d2a77a0a9458e960da5480c40cd9b829546e5189d222b643b52c15252a6dc78aab8661d6e3c13b8d2288176c25cd8873b93b874b8d3c6c49
 AUX rasdaemon.openrc-r2 424 BLAKE2B d3be2b06631ec3dc60e464b5fb38a4778e92a93fc284455f53f6b7c43a05d182b79f478362ed93a706b421ca99f6a21afdd2cbd53d125711bbf1d0f267304ace SHA512 2e30602222443e519cefc1f138dc537f5e22109fde2f8ebb0f8962abd926721389defc46cfa8db667db8618d4dc4257d36e9855367c3c8f2b7d28cb8684a4adf
 AUX sysconfig-fix-0.6.7.patch 1226 BLAKE2B 58c30284cb2d7fbf65a6f9233a9fc934f7d48b184cb3364aede9d4080dfab398c41e9f91b9c1728a3bab584ea0881d67857e9e04ba4c1c5e9dedf3c6e119a91a SHA512 3923737c47b04edc80eb5cb3b0cc5fca597fa4dfdbe42ffc262e7cedaf5debc73996befadf3fae65c1244857eabded5844c067ec0f5f3fe9468b24c5f4b780c2
 DIST rasdaemon-0.6.7.tar.bz2 422473 BLAKE2B 32a95ed9ca217fb69b197f88fa296bf0d3b4230a1ae11c60582911ff84abbe8b9a67b318774b8c4b765dbedbd4458eb220ca3b8ff4c9d065eb893a9a6a9916c5 SHA512 15beae5d4964c49b7b7f9e731948b5def9622fba5d7d17ce52a282d7834d256366cdf3cf427b82b2a6a8fd0c99f202f545000bdb06064fbae7ae0296aef0946c
+DIST rasdaemon-0.6.8.tar.gz 161343 BLAKE2B 95dab212e404480d45e5b07fa0f9ec7361036c9295a81dd082657c71cf8ad1114cc28f163b8975733e2042dfeb957f8da71dc52440249c75c24653c1ce235e86 SHA512 634638154c6b0bf7a079d6aba884a55e540c9edc3c25715a792ad7535c68629618e9cef8b6ec7e20845f78bd57f712d437be4d772523020f09d30cce42759a30
 EBUILD rasdaemon-0.6.7-r1.ebuild 1496 BLAKE2B a3da9b07cce0c7673877c8e46d8176a89da6eccf952494ead9c3abc4c13315279657de96be8b0c2b70be6ef3e323b073527ee9ba952f7873c333d5c1c6c1c838 SHA512 7c68b384e41416d41fa9aa0f73cad14dbb7ca9f655c763b4d30219dc7e6b8ba0546a308c6eb0249dd791511e33e454aa4417905e62a84228d2abc610cda91619
-EBUILD rasdaemon-0.6.7.ebuild 1268 BLAKE2B 34f2d2bb59ffb2a35c990980f1ff669712ef4a3d14e4e3270b0874b122a5323ca089ebf9df0558cac4ff88330b5b5c9ebdc9c1fac600f0b5147d2b3ab8843e45 SHA512 e7223ec552f72bc1c73b7a9831448a97b278f8654ca19449d08121fd93b3e80b541e4a34c6dbcc53ff887be3739866d0c9799357654089c65c3be9db59b3e010
-MISC metadata.xml 872 BLAKE2B 70a9674434222532c7a597ad6b1ad202dce198398271cd3d45cd5b7e13f904b72b05e95305048a46ec86416cdafb5b9989ae14f221675234ccab4f54350a2820 SHA512 66d320b2c1c6292a1bff84bfa4ee9f379b300b320fb7cf8a3a2985fa8c968569e6f7b2fc44643a9439735d1cdb4a8158ea6319129a640a7e8c9d657267df434f
+EBUILD rasdaemon-0.6.8.ebuild 1447 BLAKE2B 996a30314343ee636d1edae1c855f368df961132cdbd49e1eae8f8ac0b387756d1edce38fc00f5f77e85dc07f821fd17fb0bccd56f405aecc1c77a4b1ab1c274 SHA512 9ab8cf13ba9704a1081f89dd06d44900c8065e4e796017dd8ed758ce565121bac8a8c2b6a06dfa27832fb360502769fb353cf64559e7847b4511b33cb0dae77b
+MISC metadata.xml 1086 BLAKE2B d9017158e600a5aca8b1ca0600a36efec9f12c26493e28b129a0029caa37224b2e5341292ffdebabdc81893aebddba7b893d69f66f87ff4fd927e5310a4482c8 SHA512 3801a8c374a0d38f9efc07a288eb338739e74d1e7e41a182b871f01ce8cfd695621cfb6c883e5ce8da267e1440bf8106db6ad5ac12ef5e156bba958f72ea6297
diff --git a/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
new file mode 100644
index 000000000000..6a3beaae217c
--- /dev/null
+++ b/app-admin/rasdaemon/files/rasdaemon-0.6.8-bashisms-configure.patch
@@ -0,0 +1,186 @@
+https://github.com/mchehab/rasdaemon/pull/81
+
+From 9632f63c3855b119ab4b02300e27ab357bddcf03 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 29 Dec 2022 17:23:47 +0000
+Subject: [PATCH] configure.ac: fix bashisms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -27,14 +27,14 @@ AC_ARG_ENABLE([all],
+ AC_ARG_ENABLE([sqlite3],
+     AS_HELP_STRING([--enable-sqlite3], [enable storing data at SQL lite database (currently experimental)]))
+ 
+-AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_sqlite3" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_CHECK_LIB(sqlite3, sqlite3_open,[echo "found sqlite3"] , AC_MSG_ERROR([*** Unable to find sqlite3 library]), )
+   SQLITE3_LIBS="-lsqlite3"
+   AC_DEFINE(HAVE_SQLITE3,1,"have sqlite3")
+   AC_SUBST([WITH_SQLITE3])
+ ])
+ 
+-AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_SQLITE3], [test x$enable_sqlite3 = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_SQLITE3], [USE_SQLITE3="yes"], [USE_SQLITE3="no"])
+ 
+ AC_SUBST([SQLITE3_LIBS])
+@@ -43,122 +43,122 @@ AC_SUBST([SQLITE3_LIBS])
+ AC_ARG_ENABLE([aer],
+     AS_HELP_STRING([--enable-aer], [enable PCIe AER events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_aer" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_AER,1,"have PCIe AER events collect")
+   AC_SUBST([WITH_AER])
+ ])
+-AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_AER], [test x$enable_aer = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_AER], [USE_AER="yes"], [USE_AER="no"])
+ 
+ 
+ AC_ARG_ENABLE([non_standard],
+     AS_HELP_STRING([--enable-non-standard], [enable NON_STANDARD events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_non_standard" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_NON_STANDARD,1,"have UNKNOWN_SEC events collect")
+   AC_SUBST([WITH_NON_STANDARD])
+ ])
+-AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_NON_STANDARD], [test x$enable_non_standard = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_NON_STANDARD], [USE_NON_STANDARD="yes"], [USE_NON_STANDARD="no"])
+ 
+ AC_ARG_ENABLE([arm],
+     AS_HELP_STRING([--enable-arm], [enable ARM events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_arm" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_ARM,1,"have ARM events collect")
+   AC_SUBST([WITH_ARM])
+ ])
+-AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_ARM], [test x$enable_arm = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_ARM], [USE_ARM="yes"], [USE_ARM="no"])
+ 
+ AC_ARG_ENABLE([mce],
+     AS_HELP_STRING([--enable-mce], [enable MCE events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_mce" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_MCE,1,"have PCIe MCE events collect")
+   AC_SUBST([WITH_MCE])
+ ])
+-AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_MCE], [test x$enable_mce = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_MCE], [USE_MCE="yes"], [USE_MCE="no"])
+ 
+ AC_ARG_ENABLE([extlog],
+     AS_HELP_STRING([--enable-extlog], [enable EXTLOG events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_extlog" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_EXTLOG,1,"have EXTLOG events collect")
+   AC_SUBST([WITH_EXTLOG])
+ ])
+-AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_EXTLOG], [test x$enable_extlog = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_EXTLOG], [USE_EXTLOG="yes"], [USE_EXTLOG="no"])
+ 
+ AC_ARG_ENABLE([devlink],
+     AS_HELP_STRING([--enable-devlink], [enable devlink health events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_devlink" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_DEVLINK,1,"have devlink health events collect")
+   AC_SUBST([WITH_DEVLINK])
+ ])
+-AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_DEVLINK], [test x$enable_devlink = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_DEVLINK], [USE_DEVLINK="yes"], [USE_DEVLINK="no"])
+ 
+ AC_ARG_ENABLE([diskerror],
+     AS_HELP_STRING([--enable-diskerror], [enable disk I/O error events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_diskerror" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_DISKERROR,1,"have disk I/O errors collect")
+   AC_SUBST([WITH_DISKERROR])
+ ])
+-AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_DISKERROR], [test x$enable_diskerror = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_DISKERROR], [USE_DISKERROR="yes"], [USE_DISKERROR="no"])
+ 
+ AC_ARG_ENABLE([memory_failure],
+     AS_HELP_STRING([--enable-memory-failure], [enable memory failure events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_memory_failure" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_MEMORY_FAILURE,1,"have memory failure events collect")
+   AC_SUBST([WITH_MEMORY_FAILURE])
+ ])
+-AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_MEMORY_FAILURE], [test x$enable_memory_failure = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_MEMORY_FAILURE], [USE_MEMORY_FAILURE="yes"], [USE_MEMORY_FAILURE="no"])
+ 
+ AC_ARG_ENABLE([abrt_report],
+     AS_HELP_STRING([--enable-abrt-report], [enable report event to ABRT (currently experimental)]))
+ 
+-AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_abrt_report" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_ABRT_REPORT,1,"have report event to ABRT")
+   AC_SUBST([WITH_ABRT_REPORT])
+ ])
+-AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_ABRT_REPORT], [test x$enable_abrt_report = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_ABRT_REPORT], [USE_ABRT_REPORT="yes"], [USE_ABRT_REPORT="no"])
+ 
+ AC_ARG_ENABLE([hisi_ns_decode],
+     AS_HELP_STRING([--enable-hisi-ns-decode], [enable HISI_NS_DECODE events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_hisi_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_HISI_NS_DECODE,1,"have HISI UNKNOWN_SEC events decode")
+   AC_SUBST([WITH_HISI_NS_DECODE])
+ ])
+-AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_HISI_NS_DECODE], [test x$enable_hisi_ns_decode = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_HISI_NS_DECODE], [USE_HISI_NS_DECODE="yes"], [USE_HISI_NS_DECODE="no"])
+ 
+ AC_ARG_ENABLE([memory_ce_pfa],
+     AS_HELP_STRING([--enable-memory-ce-pfa], [enable memory Corrected Error predictive failure analysis]))
+ 
+-AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_memory_ce_pfa" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_MEMORY_CE_PFA,1,"have memory corrected error predictive failure analysis")
+   AC_SUBST([WITH_MEMORY_CE_PFA])
+ ])
+-AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_MEMORY_CE_PFA], [test x$enable_memory_ce_pfa = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_MEMORY_CE_PFA], [USE_MEMORY_CE_PFA="yes"], [USE_MEMORY_CE_PFA="no"])
+ 
+ AC_ARG_ENABLE([amp_ns_decode],
+     AS_HELP_STRING([--enable-amp-ns-decode], [enable AMP_NS_DECODE events (currently experimental)]))
+ 
+-AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" == "xyes"], [
++AS_IF([test "x$enable_amp_ns_decode" = "xyes" || test "x$enable_all" = "xyes"], [
+   AC_DEFINE(HAVE_AMP_NS_DECODE,1,"have AMP UNKNOWN_SEC events decode")
+   AC_SUBST([WITH_AMP_NS_DECODE])
+ ])
+-AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all == xyes])
++AM_CONDITIONAL([WITH_AMP_NS_DECODE], [test x$enable_amp_ns_decode = xyes || test x$enable_all = xyes])
+ AM_COND_IF([WITH_AMP_NS_DECODE], [USE_AMP_NS_DECODE="yes"], [USE_AMP_NS_DECODE="no"])
+ 
+ test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
+
diff --git a/app-admin/rasdaemon/metadata.xml b/app-admin/rasdaemon/metadata.xml
index ae831ed56223..9ee9ca3cdb8b 100644
--- a/app-admin/rasdaemon/metadata.xml
+++ b/app-admin/rasdaemon/metadata.xml
@@ -1,18 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<longdescription lang="en">
 		Rasdaemon is a RAS (Reliability, Availability and Serviceability) logging tool.
-It currently records memory errors, using the EDAC tracing events.
-EDAC is drivers in the Linux kernel that handle detection of ECC errors
-from memory controllers for most chipsets on i386 and x86_64 architectures.
-EDAC drivers for other architectures like arm also exists.
-This userspace component consists of an init script which makes sure
-EDAC drivers and DIMM labels are loaded at system startup, as well as
-an utility for reporting current error counts from the EDAC sysfs files.
+		It currently records memory errors, using the EDAC tracing events.
+		EDAC is drivers in the Linux kernel that handle detection of ECC errors
+		from memory controllers for most chipsets on i386 and x86_64 architectures.
+		EDAC drivers for other architectures like arm also exists.
+		This userspace component consists of an init script which makes sure
+		EDAC drivers and DIMM labels are loaded at system startup, as well as
+		an utility for reporting current error counts from the EDAC sysfs files.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">mchehab/rasdaemon</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
index 12a8438bc2ba..3a80aa0e89a8 100644
--- a/app-admin/rasdaemon/rasdaemon-0.6.7.ebuild
+++ b/app-admin/rasdaemon/rasdaemon-0.6.8.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-info systemd
+inherit autotools flag-o-matic linux-info systemd
 
 DESCRIPTION="Reliability, Availability and Serviceability logging tool"
-HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
-SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mchehab/rasdaemon"
+SRC_URI="https://github.com/mchehab/rasdaemon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="sqlite"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
-DEPEND=""
+DEPEND="
+	dev-db/sqlite
+	elibc_musl? ( sys-libs/argp-standalone )
+"
 RDEPEND="
 	${DEPEND}
-	sys-devel/gettext
+	dev-perl/DBI
+	dev-perl/DBD-SQLite
 	sys-apps/dmidecode
-	sqlite? (
-		dev-db/sqlite
-		dev-perl/DBD-SQLite
-	)
 "
+BDEPEND="sys-devel/gettext"
 
 PATCHES=(
-	"${FILESDIR}/sysconfig-fix-0.6.7.patch"
+	"${FILESDIR}"/${PN}-0.6.8-bashisms-configure.patch
 )
 
 pkg_setup() {
@@ -35,9 +35,15 @@ pkg_setup() {
 	check_extra_config
 }
 
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
-	local myconf=(
-		$(use_enable sqlite sqlite3)
+	local myconfargs=(
+		--enable-sqlite3
 		--enable-abrt-report
 		--enable-aer
 		--enable-arm
@@ -52,7 +58,9 @@ src_configure() {
 		--localstatedir=/var
 	)
 
-	econf "${myconf[@]}"
+	use elibc_musl && append-libs -largp
+
+	econf "${myconfargs[@]}"
 }
 
 src_install() {