app-emulation/qemu-9999: Adapt to current master

There are two changes necessary for our live ebuild. The first
one consists of rebasing qemu-2.5.0-cflags.patch because the
configure file it's patching has diverged too much.
The second change removes qemu-2.5.0-sysmacros.patch from the
list of patches for its needlessness.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>

diff --git a/app-emulation/qemu/files/qemu-4.2.0-cflags.patch b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
new file mode 100644 (file)
index 0000000..1019265
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-4.2.0-cflags.patch
@@ -0,0 +1,16 @@
+diff --git i/configure w/configure
+index a72a5def57..546d757603 100755
+--- i/configure
++++ w/configure
+@@ -6093,10 +6093,6 @@ write_c_skeleton
+ if test "$gcov" = "yes" ; then
+   QEMU_CFLAGS="-fprofile-arcs -ftest-coverage -g $QEMU_CFLAGS"
+   QEMU_LDFLAGS="-fprofile-arcs -ftest-coverage $QEMU_LDFLAGS"
+-elif test "$fortify_source" = "yes" ; then
+-  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
+-elif test "$debug" = "no"; then
+-  CFLAGS="-O2 $CFLAGS"
+ fi
+ 
+ if test "$have_asan" = "yes"; then
+

diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 0d029214a5d6424d87066e1178440eed2f269440..f872a6e7422e4f195c03a2a08aa81174087572c2 100644 (file)
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -212,10 +212,9 @@ RDEPEND="${CDEPEND}
        selinux? ( sec-policy/selinux-qemu )"
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-2.5.0-cflags.patch
-       "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
        "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
        "${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
+       "${FILESDIR}"/${PN}-4.2.0-cflags.patch
 )
 
 QA_PREBUILT="