[oe] [PATCH][meta-oe 5/8] Revert "screenshot: Move to nonworking because depends on emprint"

[Martin Jansa]

* use PNBLACKLIST instead

This reverts commit 694119f6bffa44941ac73f35d932eef1a582549d.

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../screenshot/screenshot-fix-mkinstalldirs.patch  | 23 ----------------------
 .../recipes-efl/e17/nonworking/screenshot_svn.bb   | 16 ---------------
 .../screenshot/screenshot-fix-mkinstalldirs.patch  | 23 ++++++++++++++++++++++
 meta-efl/recipes-efl/e17/screenshot_svn.bb         | 16 +++++++++++++++
 4 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/nonworking/screenshot/screenshot-fix-mkinstalldirs.patch
 delete mode 100644 meta-efl/recipes-efl/e17/nonworking/screenshot_svn.bb
 create mode 100644 meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
 create mode 100644 meta-efl/recipes-efl/e17/screenshot_svn.bb

diff --git a/meta-efl/recipes-efl/e17/nonworking/screenshot/screenshot-fix-mkinstalldirs.patch b/meta-efl/recipes-efl/e17/nonworking/screenshot/screenshot-fix-mkinstalldirs.patch
deleted file mode 100644
index 14f1141..0000000
--- a/meta-efl/recipes-efl/e17/nonworking/screenshot/screenshot-fix-mkinstalldirs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
-Subject: fix screenshot po/ building
-Upstream-Status: Pending
-
-Somehow configure doesn't substitute @MKINSTALLDIRS@ by default anymore,
-however this substitution is required for po/Makefile
-
-Fix that by calling AM_MKINSTALLDIRS from configure.ac
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
-
-Index: E-MODULES-EXTRA/screenshot/configure.ac
-===================================================================
---- E-MODULES-EXTRA.orig/screenshot/configure.ac	2011-08-17 15:49:22.000000000 +0400
-+++ E-MODULES-EXTRA/screenshot/configure.ac	2011-08-17 15:49:34.000000000 +0400
-@@ -24,6 +24,7 @@
- define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
- AC_PROG_LIBTOOL
- 
-+AM_MKINSTALLDIRS
- m4_ifdef([AM_GNU_GETTEXT_VERSION], [
- AM_GNU_GETTEXT_VERSION([0.14])
- ])
diff --git a/meta-efl/recipes-efl/e17/nonworking/screenshot_svn.bb b/meta-efl/recipes-efl/e17/nonworking/screenshot_svn.bb
deleted file mode 100644
index 9689f46..0000000
--- a/meta-efl/recipes-efl/e17/nonworking/screenshot_svn.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "MIT"
-PV = "0.3.0+svnr${SRCREV}"
-PR = "${INC_PR}.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
-SRC_URI += "file://screenshot-fix-mkinstalldirs.patch"
-
-require e-module.inc
-
-DEPENDS += "emprint"
-RDEPENDS_${PN} += "emprint"
-
-do_configure_prepend() {
-    sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac
-}
-
-
diff --git a/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
new file mode 100644
index 0000000..14f1141
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/screenshot/screenshot-fix-mkinstalldirs.patch
@@ -0,0 +1,23 @@
+From: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
+Subject: fix screenshot po/ building
+Upstream-Status: Pending
+
+Somehow configure doesn't substitute @MKINSTALLDIRS@ by default anymore,
+however this substitution is required for po/Makefile
+
+Fix that by calling AM_MKINSTALLDIRS from configure.ac
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
+
+Index: E-MODULES-EXTRA/screenshot/configure.ac
+===================================================================
+--- E-MODULES-EXTRA.orig/screenshot/configure.ac	2011-08-17 15:49:22.000000000 +0400
++++ E-MODULES-EXTRA/screenshot/configure.ac	2011-08-17 15:49:34.000000000 +0400
+@@ -24,6 +24,7 @@
+ define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
+ AC_PROG_LIBTOOL
+ 
++AM_MKINSTALLDIRS
+ m4_ifdef([AM_GNU_GETTEXT_VERSION], [
+ AM_GNU_GETTEXT_VERSION([0.14])
+ ])
diff --git a/meta-efl/recipes-efl/e17/screenshot_svn.bb b/meta-efl/recipes-efl/e17/screenshot_svn.bb
new file mode 100644
index 0000000..6dec194
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/screenshot_svn.bb
@@ -0,0 +1,16 @@
+LICENSE = "MIT"
+PV = "0.3.0+svnr${SRCREV}"
+PR = "${INC_PR}.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35"
+SRC_URI += "file://screenshot-fix-mkinstalldirs.patch"
+
+require e-module.inc
+
+DEPENDS += "emprint"
+RDEPENDS_${PN} += "emprint"
+
+do_configure_prepend() {
+    sed -i -e 's:AC_MSG_ERROR(emprint not found):echo foo:g' ${S}/configure.ac
+}
+
+PNBLACKLIST[screenshot] ?= "depends on blacklisted emprint"
-- 
2.6.0