--- dbus-1.6.18-r1.ebuild
+++ dbus-1.8.0.ebuild
@@ -57,8 +57,6 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
-
 	# Tests were restricted because of this
 	sed -i \
 		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
@@ -102,7 +100,6 @@
 		--disable-embedded-tests
 		--disable-modular-tests
 		$(use_enable debug stats)
-		--with-xml=expat
 		--with-session-socket-dir=/tmp
 		--with-system-pid-file=/var/run/dbus.pid
 		--with-system-socket=/var/run/dbus/system_bus_socket
@@ -126,11 +123,6 @@
 			--disable-libaudit
 			--disable-systemd
 			--without-x
-
-			# libxml is easier to fake since it uses pkg-config
-			--with-xml=libxml
-			LIBXML_CFLAGS=' '
-			LIBXML_LIBS=' '
 		)
 	fi