Merge remote-tracking branch 'meta-oe-contrib/jansa/pull'

42 files changed, 176 insertions, 157 deletions

diff --git a/meta-efl/classes/e-base.bbclass b/meta-efl/classes/e-base.bbclass
index ab0063bb16..1124d534b1 100644
--- a/meta-efl/classes/e-base.bbclass
+++ b/meta-efl/classes/e-base.bbclass
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "80174"
+EFL_SRCREV ?= "80662"
 
 ARM_INSTRUCTION_SET = "arm"
 
diff --git a/meta-efl/recipes-efl/efl/ecore_1.7.2.bb b/meta-efl/recipes-efl/efl/ecore_1.7.3.bb
index 3679b715f5..d65309cae5 100644
--- a/meta-efl/recipes-efl/efl/ecore_1.7.2.bb
+++ b/meta-efl/recipes-efl/efl/ecore_1.7.3.bb
@@ -7,5 +7,5 @@ SRC_URI = "\
   file://fix-ecore-fb-initialization.patch \
 "
 
-SRC_URI[md5sum] = "f6d086ea8bbe64651dc3b5d2e840d106"
-SRC_URI[sha256sum] = "0b9642a67f0d977c2a13ed83ac02387c99309db92a72bf1031482df65ee4a1c7"
+SRC_URI[md5sum] = "355ae8ec2793c89dc93ced936d853b89"
+SRC_URI[sha256sum] = "0e2facbc89dbf5182b5bf5628bcdb37fa837e7b5978ce3f4bf9839cfe06a8830"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.2.bb b/meta-efl/recipes-efl/efl/edbus_1.7.2.bb
deleted file mode 100644
index 159517c7ed..0000000000
--- a/meta-efl/recipes-efl/efl/edbus_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "c8b4c39efed63bdf503d45c8a94557a6"
-SRC_URI[sha256sum] = "e12146e7b6acca6a9f0fac5849a01ffcfa65004f7b1d5053cfb8c0e37d4dea98"
diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.3.bb b/meta-efl/recipes-efl/efl/edbus_1.7.3.bb
new file mode 100644
index 0000000000..d7c87aa92f
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edbus_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "c1eaa663812a04dcd5bdf3ea952f19d6"
+SRC_URI[sha256sum] = "f893304271b1b233933cb66ed03810d02bc47794f8c23119f656304632d6b7c9"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.2.bb b/meta-efl/recipes-efl/efl/edje_1.7.2.bb
deleted file mode 100644
index 43d9f46e52..0000000000
--- a/meta-efl/recipes-efl/efl/edje_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "20de3518260eeeed14f54e8d013e23c9"
-SRC_URI[sha256sum] = "fd512821f581b6d16998bac19e479ecf5a191940ba0e0b0a1250f6b04636d08c"
diff --git a/meta-efl/recipes-efl/efl/edje_1.7.3.bb b/meta-efl/recipes-efl/efl/edje_1.7.3.bb
new file mode 100644
index 0000000000..6232e72d3e
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/edje_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "b1901b4d98d1646b45ff27dfd9ff8b7c"
+SRC_URI[sha256sum] = "752c60f843b649d3bdfa51e78c13696ac1cd46374a8dbfe96c07cc7aba5381fb"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.2.bb b/meta-efl/recipes-efl/efl/eet_1.7.2.bb
deleted file mode 100644
index 27e5178226..0000000000
--- a/meta-efl/recipes-efl/efl/eet_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "fb3014a5227e466261a49eee5747597b"
-SRC_URI[sha256sum] = "03693c282db583d1a224d0134a61a3a138ad99cfa329f9c220f585bf8a4677f8"
diff --git a/meta-efl/recipes-efl/efl/eet_1.7.3.bb b/meta-efl/recipes-efl/efl/eet_1.7.3.bb
new file mode 100644
index 0000000000..1b1c96e7d2
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eet_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "6befcd8b1c12a44ff2c2c91bbbbe001b"
+SRC_URI[sha256sum] = "24c4f2fa8a186aa5e1a810beb58e03c806e26652f58aded6b1148c4cf44e98b3"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.2.bb b/meta-efl/recipes-efl/efl/eeze_1.7.2.bb
deleted file mode 100644
index 441262925d..0000000000
--- a/meta-efl/recipes-efl/efl/eeze_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "4a5d466a00989fe03abd218608cd1d99"
-SRC_URI[sha256sum] = "fbbf42665a2618a2ca7a8080c7a2617cad819b24b3cb3c4f54417aab67ddac97"
diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.3.bb b/meta-efl/recipes-efl/efl/eeze_1.7.3.bb
new file mode 100644
index 0000000000..c80fc5fc9c
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eeze_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "4ccc70135b1221a532206fb53c84e434"
+SRC_URI[sha256sum] = "22a47e477609dda00e8360f05648367c320289a7132cc2f012e830632da92c6b"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.2.bb b/meta-efl/recipes-efl/efl/efreet_1.7.2.bb
deleted file mode 100644
index 92499c9811..0000000000
--- a/meta-efl/recipes-efl/efl/efreet_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "7490ccdb57d298e6226b4f5cb956c5c5"
-SRC_URI[sha256sum] = "ebb8175664f9c486bd112a4915bda794ef0ecc68833bb6726cd76a395e64ab94"
diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.3.bb b/meta-efl/recipes-efl/efl/efreet_1.7.3.bb
new file mode 100644
index 0000000000..f5ed47b9f7
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/efreet_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "64a279b4568a769f657b9c9820a0bf74"
+SRC_URI[sha256sum] = "bc337d6c2cf80358d25e885c3c3dd3098cbedf1b5e4ef8d2acab41b4870648df"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.2.bb b/meta-efl/recipes-efl/efl/eina_1.7.2.bb
deleted file mode 100644
index 4feb9c24da..0000000000
--- a/meta-efl/recipes-efl/efl/eina_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "5d0453d6e7eb6f2c1b4e40b8c5be6f20"
-SRC_URI[sha256sum] = "caa1be5cdf3ed450472d4fa114983762bf40699adff506e6b493e4e37c842018"
diff --git a/meta-efl/recipes-efl/efl/eina_1.7.3.bb b/meta-efl/recipes-efl/efl/eina_1.7.3.bb
new file mode 100644
index 0000000000..71319dd4c5
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eina_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "00669561a82bad4df4a6268f1957ae40"
+SRC_URI[sha256sum] = "94e312367a8d04a7d69627e5a3bb1eb4bd8de9d165c0288400527808ef43f956"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.2.bb b/meta-efl/recipes-efl/efl/eio_1.7.2.bb
deleted file mode 100644
index cfdfe073cf..0000000000
--- a/meta-efl/recipes-efl/efl/eio_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "b8e3b115a63f423a70ce7459c0b77d58"
-SRC_URI[sha256sum] = "c4af1062c27d2e0fef6d6919df39921c832553ff448628a5d9fe3704186a714b"
diff --git a/meta-efl/recipes-efl/efl/eio_1.7.3.bb b/meta-efl/recipes-efl/efl/eio_1.7.3.bb
new file mode 100644
index 0000000000..e90df9c84f
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/eio_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "968f7672eb6ee96e4bdd2bbfe55e5e8a"
+SRC_URI[sha256sum] = "f63c02f04edc6c53e29b41488ca3749a8cae5bed76803d60ad80be4ca117c635"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.7.2.bb b/meta-efl/recipes-efl/efl/elementary_1.7.2.bb
deleted file mode 100644
index dedc67d6c0..0000000000
--- a/meta-efl/recipes-efl/efl/elementary_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "589ae692eb8dbe73fa12b1587c8f877d"
-SRC_URI[sha256sum] = "582dd348e7dfcf76d7ec7fcfc3d4f6f8a73b653ffecf6979121a3bce190f98cf"
diff --git a/meta-efl/recipes-efl/efl/elementary_1.7.3.bb b/meta-efl/recipes-efl/efl/elementary_1.7.3.bb
new file mode 100644
index 0000000000..d066cb8656
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/elementary_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2075fbbe8523027a3659ad08bfcf5a02"
+SRC_URI[sha256sum] = "043375ba63fa8619e053e9014566fc72f22522ef48daedcdfc62dfc1f3eb0a22"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.2.bb b/meta-efl/recipes-efl/efl/embryo_1.7.2.bb
deleted file mode 100644
index dcf2155868..0000000000
--- a/meta-efl/recipes-efl/efl/embryo_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "4dd84e5c7f515b707e4d0fac92b60cc8"
-SRC_URI[sha256sum] = "48e068da62f3bcad7fcf0dad6715f5a0c1cc75ae05529cc39679aeb7560d6803"
diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.3.bb b/meta-efl/recipes-efl/efl/embryo_1.7.3.bb
new file mode 100644
index 0000000000..91bec48b57
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/embryo_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "eacc4e3a3534965469136a2e7cdd076b"
+SRC_URI[sha256sum] = "3a7388225ce97432e4324f5c2da4d4aaa3e711b8a6e92021b4edd47fbed5099a"
diff --git a/meta-efl/recipes-efl/efl/emotion.inc b/meta-efl/recipes-efl/efl/emotion.inc
index 134ef40611..a4ef02d166 100644
--- a/meta-efl/recipes-efl/efl/emotion.inc
+++ b/meta-efl/recipes-efl/efl/emotion.inc
@@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69f44058245ce5c596d56bb622d5dabd"
 # we no longer build the libxine backend, since the gstreamer backend seems more promising
 DEPENDS = "eet eeze evas ecore edje gstreamer gst-plugins-base eio"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 inherit efl
 
-EXTRA_OECONF = "--disable-xine --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+EXTRA_OECONF = "--disable-xine --disable-generic-vlc --enable-gstreamer --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
 PACKAGES =+ "emotion-backend-gstreamer"
 FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.2.bb b/meta-efl/recipes-efl/efl/emotion_1.7.2.bb
deleted file mode 100644
index fa681cb177..0000000000
--- a/meta-efl/recipes-efl/efl/emotion_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "e00a876a607cf6a99c5fc768d2fb69de"
-SRC_URI[sha256sum] = "a280b499a51b531a19c368c1f394b27dda4f6c1f5a0edd8f29036169a9402cef"
diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.3.bb b/meta-efl/recipes-efl/efl/emotion_1.7.3.bb
new file mode 100644
index 0000000000..63578f547b
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/emotion_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "aa1f96d4166edc154e773210e8ac8d21"
+SRC_URI[sha256sum] = "93f5f00127176701b946d0db941d5209c5ca13659e184a31c0883ac1e145ce5d"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.2.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.2.bb
deleted file mode 100644
index d5e1cea8fa..0000000000
--- a/meta-efl/recipes-efl/efl/ethumb_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "33f8de3b590269b7dbe6960a0337b30f"
-SRC_URI[sha256sum] = "6dcdf94224903c17ac753a388e6a2d0c23ce525859db93f022c3cd2b8f9afe72"
diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.3.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.3.bb
new file mode 100644
index 0000000000..2a5e275b9b
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/ethumb_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "7394c4776a980490aea0bea5e35f05a4"
+SRC_URI[sha256sum] = "25090565d995029a4fb57ac82ded1470b1beb8c23eeadaf713a30ca0cf58bb29"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb
deleted file mode 100644
index e37de878f9..0000000000
--- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "991f0ce50e203419f54cb148fb949bb9"
-SRC_URI[sha256sum] = "0ca06936cfe308593c36eb80ac80ad229f2bc3bdc9270b75f96e09595194caae"
diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb
new file mode 100644
index 0000000000..3f2e63df58
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "e188843ccf4cdcf31f9645fdd28c9567"
+SRC_URI[sha256sum] = "98bf7896535ca9d454bbc5b84b59c619a4b0ac80fadd067a102d20f1a9ea5db0"
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.2.bb b/meta-efl/recipes-efl/efl/evas_1.7.2.bb
deleted file mode 100644
index e9171f924b..0000000000
--- a/meta-efl/recipes-efl/efl/evas_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "4e412c79609ae107968c9c45c4b900c0"
-SRC_URI[sha256sum] = "2076608e6a9ac3331b17357c152b640ea0f3eccad24a9c270ad325d5434ab811"
diff --git a/meta-efl/recipes-efl/efl/evas_1.7.3.bb b/meta-efl/recipes-efl/efl/evas_1.7.3.bb
new file mode 100644
index 0000000000..8dc4d32ed0
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/evas_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "2a5bab8f87569d770b4a95fc0a382be4"
+SRC_URI[sha256sum] = "d47cb26a384e6d523aa18df4fd558d0415165322ba714b83d99799e8531c617b"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.2.bb b/meta-efl/recipes-efl/efl/expedite_1.7.2.bb
deleted file mode 100644
index e7f59261ae..0000000000
--- a/meta-efl/recipes-efl/efl/expedite_1.7.2.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require ${BPN}.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI = "\
-  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
-"
-
-SRC_URI[md5sum] = "f7bbf5dc5bc1212d3116c5452b4a3510"
-SRC_URI[sha256sum] = "f8a4214e3d210396b267325268ba6fcc31a42634fab5bf2efcbc595dbfb2c25f"
diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.3.bb b/meta-efl/recipes-efl/efl/expedite_1.7.3.bb
new file mode 100644
index 0000000000..f109a80507
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/expedite_1.7.3.bb
@@ -0,0 +1,10 @@
+require ${BPN}.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "\
+  ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \
+"
+
+SRC_URI[md5sum] = "e13456be6c8c6276baeefa2b91d14e7b"
+SRC_URI[sha256sum] = "4b9ec22d25d5847998cd9a60ba2edd47e5e217183e661e60b8440252c62f916f"
diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
index 59d81b4f50..ea4ce4b098 100644
--- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra"
 
+PR = "r1"
+
 inherit gnome
 
 SRC_URI[archive.md5sum] = "b4e8ab5c7556ae07addbfcfb4fa2f761"
@@ -22,8 +24,5 @@ FILES_${PN} += "${datadir}/icon* \
                 ${datadir}/desktop-directories \
                "
 FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
-FILES_${PN}-dev += "${libdir}/window-manager-settings/*a"
-
-
-
-
+FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la"
+FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a"
diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
index 8cd6a0e97d..733b8ed110 100644
--- a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
+++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
                     file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
 DEPENDS = "gtk+ gnome-doc-utils-native"
 
+PR = "r1"
+
 inherit autotools pkgconfig pythonnative
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
@@ -14,6 +16,10 @@ SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d
 
 EXTRA_OECONF += "--disable-scrollkeeper"
 
+do_configure_prepend() {
+	sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am
+}
+
 FILES_${PN} += "${datadir}/icons"
 FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
 FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
diff --git a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
index 8be41af41b..3b8150be9b 100644
--- a/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
+++ b/meta-oe/recipes-extended/iotop/iotop_0.4.4.bb
@@ -4,6 +4,8 @@ DESCRIPTION = "iotop does for I/O usage what top(1) does for CPU usage. \
  a table of current I/O usage by processes on the system."
 HOMEPAGE = "http://guichaz.free.fr/iotop/"
 
+PR = "r1"
+
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
 
@@ -14,9 +16,8 @@ SRC_URI[sha256sum] = "46f3279fb1a7dfc129b5d00950c6e8389e4aedeb58880e848b88d68648
 inherit distutils
 
 do_install_append() {
-	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo
-	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py
-	[ -d ${D}${datadir}/share ] && rmdir ${D}${datadir}/share
+	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.pyo || true
+	rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/site.py  || true
 }
 
 RDEPENDS_${PN} = "python-distutils python-curses python-textutils \
diff --git a/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend b/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
deleted file mode 100644
index d9f1c295f5..0000000000
--- a/meta-oe/recipes-graphics/xorg-lib/pixman_0.27.2.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PRINC := "${@int(PRINC) + 1}"
diff --git a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
index 87a36108df..2fcd3da026 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
+++ b/meta-oe/recipes-qt/qconnman/qconnman-e_git.bb
@@ -6,3 +6,5 @@ inherit qt4e
 
 EXTRA_QMAKEVARS_PRE += "PREFIX=/usr"
 EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
+
+FILES_${PN} += "${datadir}/qconnman/"
diff --git a/meta-oe/recipes-qt/qconnman/qconnman.inc b/meta-oe/recipes-qt/qconnman/qconnman.inc
index f26274ba8f..44ad9a1d1d 100644
--- a/meta-oe/recipes-qt/qconnman/qconnman.inc
+++ b/meta-oe/recipes-qt/qconnman/qconnman.inc
@@ -4,7 +4,7 @@ DEPENDS = "connman"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.3.bbappend b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
index 27cac1105e..27cac1105e 100644
--- a/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.3.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-embedded_4.8.4.bbappend
diff --git a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
index 27cac1105e..27cac1105e 100644
--- a/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend
+++ b/meta-oe/recipes-qt/qt4/qt4-x11-free_4.8.4.bbappend
diff --git a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
index 52c8becb0d..efacc8ea4c 100644
--- a/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
+++ b/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "gmp openssl flex-native flex bison-native"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2"
 SRC_URI[md5sum] = "c8b861305def7c0abae04f7bbefec212"
@@ -15,6 +15,10 @@ EXTRA_OECONF = "--disable-curl --disable-soup --disable-ldap \
 		--enable-gmp --disable-mysql --disable-sqlite \
 		--enable-openssl"
 
+SYSTEMD_UNITDIR ??= "no"
+
+EXTRA_OECONF += "--with-systemdsystemunitdir=${SYSTEMD_UNITDIR}"
+
 inherit autotools
 
 RRECOMMENDS_${PN} = "kernel-module-ipsec"
diff --git a/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
new file mode 100644
index 0000000000..a60a109afd
--- /dev/null
+++ b/meta-systemd/meta-oe/recipes-support/strongswan/strongswan_5.0.0.bbappend
@@ -0,0 +1,8 @@
+inherit systemd
+
+PRINC := "${@int(PRINC) + 1}"
+
+SYSTEMD_UNITDIR = "${systemd_unitdir}/system"
+
+SYSTEMD_PACKAGES = "${PN}-systemd"
+SYSTEMD_SERVICE = "${PN}.service"
diff --git a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
index b016bdc2fb..0e08358b29 100644
--- a/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
+++ b/meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.32.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 1}"
 
 inherit systemd