5 files changed, 6 insertions, 29 deletions
diff --git a/packages/vala/files/HACK-work-around-vte-bug.patch b/packages/vala/files/HACK-work-around-vte-bug.patch
deleted file mode 100644
index cdccadf9c3..0000000000
--- a/packages/vala/files/HACK-work-around-vte-bug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-:M:
-
-Index: vala-0.5.1/vapi/vte.vapi
-===================================================================
---- vala-0.5.1.orig/vapi/vte.vapi
-+++ vala-0.5.1/vapi/vte.vapi
-@@ -37,7 +37,7 @@ namespace Vte {
- 		public void feed_child (string text, long length);
- 		public void feed_child_binary (string data, long length);
- 		[NoArrayLength]
--		public int fork_command (string? command, string[]? argv, string[]? envv, string? directory, bool lastlog, bool utmp, bool wtmp);
-+		public int fork_command (string command, string[] argv, string[]? envv, string? directory, bool lastlog, bool utmp, bool wtmp);
- 		public int forkpty (string[] envv, string directory, bool lastlog, bool utmp, bool wtmp);
- 		public weak Gtk.Adjustment get_adjustment ();
- 		public bool get_allow_bold ();
diff --git a/packages/vala/vala-native_0.5.3.bb b/packages/vala/vala-native_0.5.4.bb
index 13ed6ad275..8feab501b4 100644
--- a/packages/vala/vala-native_0.5.3.bb
+++ b/packages/vala/vala-native_0.5.4.bb
@@ -1,6 +1,5 @@
 require vala_${PV}.bb
+PR = "r0"
 
 inherit native
 DEPENDS = "glib-2.0-native"
-
-
diff --git a/packages/vala/vala.inc b/packages/vala/vala.inc
index 8fec12c2a3..fbf6ca5c3a 100644
--- a/packages/vala/vala.inc
+++ b/packages/vala/vala.inc
@@ -5,10 +5,13 @@ DEPENDS = "glib-2.0 dbus"
 HOMEPAGE = "http://live.gnome.org/Vala"
 LICENSE = "LGPL"
 
+SRC_URI = "http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2"
 S = "${WORKDIR}/vala-${PV}"
 
 inherit autotools lib_package
 
+EXTRA_OECONF = "--enable-vapigen"
+
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/vala/vala_0.5.3.bb b/packages/vala/vala_0.5.3.bb
deleted file mode 100644
index 1f509524e0..0000000000
--- a/packages/vala/vala_0.5.3.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require vala.inc
-
-PR = "r1"
-
-MAJV = "${@bb.data.getVar('PV',d,1)[:3]}"
-
-SRC_URI = "\
-  http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2 \
-  file://HACK-work-around-vte-bug.patch;patch=1 \
-"
-
-EXTRA_OECONF = " --enable-vapigen "
diff --git a/packages/vala/vala_0.5.4.bb b/packages/vala/vala_0.5.4.bb
new file mode 100644
index 0000000000..8775f1a407
--- /dev/null
+++ b/packages/vala/vala_0.5.4.bb
@@ -0,0 +1,2 @@
+require vala.inc
+PR = "r0"