dev-db/scylla: drop fcaps and obsolete cflags, add -g

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Manifest-Sign-Key: 34FCB257983BA23A8CEC5EB7EB9E6405C24BFAE5
Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>

4 files changed, 19 insertions, 68 deletions

diff --git a/dev-db/scylla/Manifest b/dev-db/scylla/Manifest
index 9050ae3..f068bc8 100644
--- a/dev-db/scylla/Manifest
+++ b/dev-db/scylla/Manifest
@@ -18,21 +18,21 @@ EBUILD scylla-3.1.1-r1.ebuild 7563 BLAKE2B 1b955ad9dd0eb185fecd1f0240c66d14749cc
 EBUILD scylla-3.1.1-r2.ebuild 7622 BLAKE2B 404ab3d8e42898a7379aa9872eb710aa183ca1a0788b69df2acca9fee2add0cff3e20a86496cd4151ebc8127e32678f08386e5bad9b7041cd8e18137bd77b0d2 SHA512 9514d12445fdbf9c7b9a26d9bd0b83decd9be3f4aa6f940943cd7761d5364c7d944a59ecfdcf4686580c25d3572e1b927b6422e19e764e4c348f4f6508ec1b91
 EBUILD scylla-3.1.1.ebuild 7497 BLAKE2B 9f9a71a22eecababea0ec5c4f156b50d2c858f3c764acaedb77eb159d0e4c6c9f8ce4c4efde856d04edce0a89d40759ed56bea62c7f693e44e489d3d69f8f6fa SHA512 b6fee615043cce8801f9d84d0599a6e6fb6ded7553b04b1b38bc7b560576ac918b20e542a8064d54ae9615bafa2fe7e854069bb749d0fd332c3c4584104a05a3
 EBUILD scylla-3.1.2-r1.ebuild 7672 BLAKE2B 7249eb175499b7aa9ac0a5df43ffb4a573eca25d5f1b23c79935bd444320d977d7c2b3953c4569a606ded4a15028dc09c8374d1a0df8ce6dd45471a23fd2c662 SHA512 0e5ebf4b64ce7f4496ab94c87a3f8c432f762909f35b03501a4c84e6f6a7f780c35b947ececf0fd8e32a0a13dd011b8b074a955994cb46342336c2edb0e348c5
-EBUILD scylla-3.1.2.ebuild 7579 BLAKE2B 62494a60364bbb769164149123c41777637810fb5ab4b8a17627bf7980f09baa811510933abf7496858f4d87e1b03201d600d27e8e62577d574924f479c9c36d SHA512 5a833dd397e9e157453934ae2c5d51433a3b2f07fd825e70d403ac3ae11dd9fadf1886752b035938da3bf5e814f913ca55f8ac6b6fb98cf5ef4bc2a2e4445b3c
-EBUILD scylla-3.2_rc3.ebuild 7505 BLAKE2B 08098a997e709e71b453cf4991bd6df818118cf336a06e2e3eea9a6ac93b0bfa393fbdb1cc9398f2dcce216a716beaf75e984214cdf881aaffb3f38a0f2d8225 SHA512 9aec1e09b7f60861eaa5acd91ae0fb563ae4a3e7e7d665d9738c3647df1870d0cb590abafdec3168a77b668537c9815c98decb127b919e7ab64f050f1519aaa1
-EBUILD scylla-9999.ebuild 6901 BLAKE2B fe6cf59aa937527a766bc7f05664efaebbd79b6257d2583612eeb0bfcb63cf8453814e99c908e42d86951a12b2ea5e12c135b632bf903aa4c1d949b8c8436db8 SHA512 2c5dcc253c1ef40fe6cbcfd58e537e26ca0ebe51ded0a065f9bcd45c07f584744336bc0e001ce67d6cce7f10c3cc581f8dff2ee56b02750051b91ee00f3a3996
+EBUILD scylla-3.1.2.ebuild 7075 BLAKE2B 6b690c242e061b69eb60d954cdbc00adc87651961cab3864b54b861b0349588110e4ba2c254076ae86a924e8f334937af9b60c11ca23a8f84553c11f920703cc SHA512 9a568b06f7b12ba8a09919c9f0a8f08c954a7a339eb1568026b6b2f8a8f5e8438f468c195ed6617402a2ef78aca42310f8388ce39312fb1b71bc09ea6c88990f
+EBUILD scylla-3.2_rc3.ebuild 7006 BLAKE2B 192ae36f361fec9bfeddf69400f698ae6dbdeb3ebba230da8f769e1f363353dace59deac4a8c81502865e91f39281700522dea070371e43288d91a7d8beddabe SHA512 78368f630eaf5131a2d06e37c43be51a19daf4ff146c2cb5618c18c253bf34c810b2467d56e8bb9065d275025aa9e0881247ce1c96291ea3f31b64068c62faf8
+EBUILD scylla-9999.ebuild 6403 BLAKE2B 4e176d656ed4224cf625562ffe89f422124bd05ae39f0d5d9b4e68093362bd8f4f44dd71f66e81d28c39c741ff4b9ba62c72fb237799a630d41e9d41b73ad250 SHA512 e04b414ee51c1b3ffea859c25f4ee40f75447d16b0494f25b1ca3bf756d7cce5823c9cb4d19be90dace91248edee826c20be608393eada09fda8913efe25c11b
 MISC metadata.xml 249 BLAKE2B 40afa233e18ae5678e52194be8b1235d8deda4810e55b33ea192ded6b09a158f1bc941544f90a1b9e396db00bc0fe277c072d267568473ae4aa2dec8bc5c2f89 SHA512 6eae78a65db44c8f7ef2d20c10c8612cd2072c0204c6294798e4bf94f1283c684c22d1ad28e0f68e78e82a0c60526d6786492c9dacc438d83405218e51c1bf9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4TcYJfFIAAAAAALgAo
+iQGTBAEBCAB9FiEEB7NG2KqNbQw8gqQ7Uf8j8ayXdy8FAl4UdxZfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDA3
 QjM0NkQ4QUE4RDZEMEMzQzgyQTQzQjUxRkYyM0YxQUM5Nzc3MkYACgkQUf8j8ayX
-dy+DfQf8CGEOU32GhLCZZpwam0gWXy+wawARFTBau10aEvq07/ZVS0i0jmZym6qO
-bI1D68ltwodqvPjzJvseOyQNux+2WOhzEx94qb1lGH32oNPJ0za2l0zml32zKPm6
-PIfca023ON/m0Aqfj3sJtfoDVSIFsjiDl15IHKFtAc5zml47G3LfA/6VMizCIxMQ
-wiFsnXghruCxxv/vrH+j9tNl96iC5oDfF4/fGWsS0Q7EXOqisxd0LyML0DIYnQDO
-n2lf2iQdoqjzRlB5wLmdXadpBp1RIz4xI638u6dbAhuSLKO0TGNLsL/qgK6A5cot
-fu+T7twm6cQb1HWcvZl9NZWDWSAJMA==
-=ed6d
+dy+sLgf/RTefGFD91xrmBFsxa1Pcm095trtsaf/wLb1AmS5zmhJyNtcwWoxRs+6c
+szmVEWePePT2eom++rlvFqKaUoqaadVSh8qQA17sOB6TpZ20UqasYSsYZd4tOclR
+922MgGpG4OTu6J54FW1V4U/LSaUM6pdBqS5CNt07cM2YKnz3z850Gys8F60awxan
+LdLNohLI4VQzp6kWRQ2hRe/kl5QcGX/onx94XLr2wJZ04jpNAKrhVtGZk84XV+zH
+wz0Gz4XcmYXe9EN9eyc1JIhEccUSX3toUuMmLRtWFaSeQMFAIJyPI6doM0DbnyP9
+SjZbCgCPp981pTIitgIFgNMAaFWsfA==
+=XOvm
 -----END PGP SIGNATURE-----
diff --git a/dev-db/scylla/scylla-3.1.2.ebuild b/dev-db/scylla/scylla-3.1.2.ebuild
index 86aa597..b119924 100644
--- a/dev-db/scylla/scylla-3.1.2.ebuild
+++ b/dev-db/scylla/scylla-3.1.2.ebuild
@@ -11,7 +11,7 @@ inherit git-r3
 
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit autotools fcaps flag-o-matic linux-info python-r1 toolchain-funcs systemd user
+inherit autotools flag-o-matic linux-info python-r1 toolchain-funcs systemd user
 
 DESCRIPTION="NoSQL data store using the seastar framework, compatible with Apache Cassandra"
 HOMEPAGE="http://scylladb.com/"
@@ -86,9 +86,6 @@ ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (T
 # ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
 
 DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
-FILECAPS=(
-	cap_sys_nice /usr/bin/scylla
-)
 PATCHES=(
 	"${FILESDIR}/fix-fmt-3.5.0-compilation.patch"
 	"${FILESDIR}/3.1-thrift-support.patch"
@@ -137,21 +134,8 @@ src_prepare() {
 src_configure() {
 	python_setup
 
-	# copied from dist/redhat/scylla.spec.mustache
-	# we want a package compiled with old kernel headers to
-	# support nowait aio if the user upgrades their kernel
-	if ! grep -qwr RWF_NOWAIT /usr/include/linux; then
-	    append-cflags "-DRWF_NOWAIT=8"
-	fi
-	if ! grep -qwr aio_rw_flags /usr/include/linux; then
-	    append-cflags "-Daio_rw_flags=aio_reserved1"
-	fi
-
-	# native CPU CFLAGS are strongly enforced by upstreams, respect that
-	replace-cpu-flags "*" "native"
-
-	filter-flags -fomit-frame-pointer
-	append-cflags -Wno-attributes -Wno-array-bounds
+	# needed for blocked reactors logging as it disables -fomit-frame-pointers
+	append-cflags -g
 
 	${EPYTHON} configure.py --enable-gcc6-concepts --mode=release --with=scylla --disable-xen --c-compiler "$(tc-getCC)" --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} --with-antlr3 /usr/bin/antlr3.5 || die
 }
diff --git a/dev-db/scylla/scylla-3.2_rc3.ebuild b/dev-db/scylla/scylla-3.2_rc3.ebuild
index 36de097..af14772 100644
--- a/dev-db/scylla/scylla-3.2_rc3.ebuild
+++ b/dev-db/scylla/scylla-3.2_rc3.ebuild
@@ -87,11 +87,7 @@ ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (T
 # ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
 
 DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md )
-FILECAPS=(
-	cap_sys_nice /usr/bin/scylla
-)
-PATCHES=(
-)
+PATCHES=()
 
 pkg_setup() {
 	linux-info_pkg_setup
@@ -139,21 +135,8 @@ src_prepare() {
 src_configure() {
 	python_setup
 
-	# copied from dist/redhat/scylla.spec.mustache
-	# we want a package compiled with old kernel headers to
-	# support nowait aio if the user upgrades their kernel
-	if ! grep -qwr RWF_NOWAIT /usr/include/linux; then
-	    append-cflags "-DRWF_NOWAIT=8"
-	fi
-	if ! grep -qwr aio_rw_flags /usr/include/linux; then
-	    append-cflags "-Daio_rw_flags=aio_reserved1"
-	fi
-
-	# native CPU CFLAGS are strongly enforced by upstreams, respect that
-	replace-cpu-flags "*" "native"
-
-	filter-flags -fomit-frame-pointer
-	append-cflags -Wno-attributes -Wno-array-bounds
+	# needed for blocked reactors logging as it disables -fomit-frame-pointers
+	append-cflags -g
 
 	${EPYTHON} configure.py --enable-gcc6-concepts --mode=release --with=scylla --disable-xen --c-compiler "$(tc-getCC)" --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} --with-antlr3 /usr/bin/antlr3.5 || die
 }
diff --git a/dev-db/scylla/scylla-9999.ebuild b/dev-db/scylla/scylla-9999.ebuild
index 84a8ce5..16aba71 100644
--- a/dev-db/scylla/scylla-9999.ebuild
+++ b/dev-db/scylla/scylla-9999.ebuild
@@ -83,9 +83,6 @@ ERROR_TRANSPARENT_HUGEPAGE="${PN} recommends support for Transparent Hugepage (T
 # ERROR_VFIO="${PN} running with DPDK recommends support for Non-Privileged userspace driver framework (VFIO)."
 
 DOCS=( LICENSE.AGPL NOTICE.txt ORIGIN README.md README-DPDK.md )
-FILECAPS=(
-	cap_sys_nice /usr/bin/scylla
-)
 PATCHES=()
 
 pkg_setup() {
@@ -119,21 +116,8 @@ src_prepare() {
 src_configure() {
 	python_setup
 
-	# copied from dist/redhat/scylla.spec.mustache
-	# we want a package compiled with old kernel headers to
-	# support nowait aio if the user upgrades their kernel
-	if ! grep -qwr RWF_NOWAIT /usr/include/linux; then
-	    append-cflags "-DRWF_NOWAIT=8"
-	fi
-	if ! grep -qwr aio_rw_flags /usr/include/linux; then
-	    append-cflags "-Daio_rw_flags=aio_reserved1"
-	fi
-
-	# native CPU CFLAGS are strongly enforced by upstreams, respect that
-	replace-cpu-flags "*" "native"
-
-	filter-flags -fomit-frame-pointer
-	append-cflags -Wno-attributes -Wno-array-bounds
+	# needed for blocked reactors logging as it disables -fomit-frame-pointers
+	append-cflags -g
 
 	${EPYTHON} configure.py --enable-gcc6-concepts --mode=release --with=scylla --disable-xen --c-compiler "$(tc-getCC)" --compiler "$(tc-getCXX)" --ldflags "${LDFLAGS}" --cflags "${CFLAGS}" --python ${EPYTHON} --with-antlr3 /usr/bin/antlr3.5 || die
 }