--- a/webkit-gtk-2.8.5.ebuild	2015-09-13 19:31:02.000000000 +0200
+++ b/webkit-gtk-2.8.5.ebuild	2015-11-03 23:12:05.837201899 +0100
@@ -86,10 +86,10 @@
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.10
 	|| (
+		virtual/rubygems[ruby_targets_ruby19]
 		virtual/rubygems[ruby_targets_ruby20]
 		virtual/rubygems[ruby_targets_ruby21]
 		virtual/rubygems[ruby_targets_ruby22]
-		virtual/rubygems[ruby_targets_ruby19]
 	)
 	>=app-accessibility/at-spi2-core-2.5.3
 	>=dev-libs/atk-2.8.0
@@ -135,11 +135,8 @@
 }
 
 src_prepare() {
-	# Debian patches to fix support for some arches
-	# https://bugs.webkit.org/show_bug.cgi?id=129540
-	epatch "${FILESDIR}"/${PN}-2.6.0-{hppa,ia64}-platform.patch
-	# https://bugs.webkit.org/show_bug.cgi?id=129542
-	epatch "${FILESDIR}"/${PN}-2.8.1-ia64-malloc.patch
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	epatch "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
 
 	# https://bugs.webkit.org/show_bug.cgi?id=148379
 	epatch "${FILESDIR}"/${PN}-2.8.5-webkit2gtkinjectedbundle-j1.patch
@@ -158,6 +155,9 @@
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
 	use alpha && append-ldflags "-Wl,--no-relax"
 
+	# ld segfaults on ia64 with LDFLAGS --as-needed
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
 	# Sigbuses on SPARC with mcpu and co., bug #???
 	use sparc && filter-flags "-mvis"
 
@@ -183,14 +183,14 @@
 
 	local ruby_interpreter=""
 
-	if has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	if has_version "virtual/rubygems[ruby_targets_ruby19]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
 	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
 		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby20)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
 	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby19)"
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
 	fi
 
 	# TODO: Check Web Audio support