efl++: move inside efl1 since it's now a subproject of E17

8 files changed, 10 insertions, 112 deletions

diff --git a/packages/efl++/.mtn2git_empty b/packages/efl++/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/efl++/.mtn2git_empty
+++ /dev/null
diff --git a/packages/efl++/efl++-fb_cvs.bb b/packages/efl++/efl++-fb_cvs.bb
deleted file mode 100644
index 8706a32033..0000000000
--- a/packages/efl++/efl++-fb_cvs.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require efl++.inc
-
-PV = "0.1.0+cvs${SRCDATE}"
-
-SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/eflpp;module=efl++"
-S = "${WORKDIR}/efl++"
-
-
-
diff --git a/packages/efl++/efl++-x11_cvs.bb b/packages/efl++/efl++-x11_cvs.bb
deleted file mode 100644
index 4beb8c555e..0000000000
--- a/packages/efl++/efl++-x11_cvs.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require efl++.inc
-
-EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11"
-PV = "0.1.0+cvs${SRCDATE}"
-
-SRC_URI = "cvs://anonymous@projects.linuxtogo.org/cvsroot/eflpp;module=efl++"
-S = "${WORKDIR}/efl++"
-
-
-
diff --git a/packages/efl++/efl++.inc b/packages/efl++/efl++.inc
deleted file mode 100644
index 52cea6e2aa..0000000000
--- a/packages/efl++/efl++.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries"
-SECTION = "e/libs"
-LICENSE = "LGPL"
-AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-HOMEPAGE = "http://www.Vanille.de/projects/efl++.html"
-DEPENDS = "virtual/evas virtual/ecore etk edje libsigc++-2.0"
-PROVIDES = "virtual/efl++"
-
-SRC_URI = "http://www.Vanille.de/download/efl/efl++_${PV}.tar.bz2 \
-           file://fix-src.pro.patch;patch=1 \
-           file://disable-smart.patch;patch=1"
-S = "${WORKDIR}/efl++-${PV}"
-
-inherit qmake qt4x11
-
-PARALLEL_MAKE = ""
-QMAKE_PROFILES = "efl++.pro"
-EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
-export OE_QMAKE_LINK="${CXX}"
-export EDIR="${S}"
-
-do_configure_prepend() {
-	rm include.pro
-	cat <<EOF >include.pro
-include ( common.pro )
-
-LIBS        += -L${EDIR}
-
-EFLCONFIG      = console release eflbasic angstrom
-INCLUDEPATH += ${EDIR}/src/common ${EDIR}/src/extra ${EDIR}/src/misc
-INCLUDEPATH += ${EDIR}/src/evas ${EDIR}/src/ecore ${EDIR}/src/edje
-INCLUDEPATH += ${EDIR}/src/esmart ${EDIR}/src/ewl
-
-DEFINES += DATADIR=\"${datadir}/efl++/\"
-
-EOF
-}
-
-do_stage() {
-	for i in src/common/*.h src/evas/*.h src/ecore/*.h src/edje/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}
-	done
-	oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR}
-}
-
-do_install() {
-	oe_libinstall -so -C ${S} libefl++ ${D}${libdir}
-	install -d ${D}${bindir}
-	install *-* ${D}${bindir}
-	install -d ${D}${datadir}/efl++
-	cp -pPR data/* ${D}${datadir}/efl++
-}
-
-PACKAGES =+ "efl++-examples"
-FILES_${PN} = "${libdir}"
-FILES_efl++-examples = "${bindir} ${datadir}"
diff --git a/packages/efl++/files/.mtn2git_empty b/packages/efl++/files/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/efl++/files/.mtn2git_empty
+++ /dev/null
diff --git a/packages/efl++/files/disable-smart.patch b/packages/efl++/files/disable-smart.patch
deleted file mode 100644
index cdb157cdef..0000000000
--- a/packages/efl++/files/disable-smart.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- efl++-0.1.0/src/evas/evas.cpp~disable-smart
-+++ efl++-0.1.0/src/evas/evas.cpp
-@@ -7,9 +7,13 @@
- /* EFL */
- extern "C" {
- #include <Edje.h>
-+#ifdef EFL_SUPPORT_ESMART
- #include <Esmart/Esmart_Container.h>
- #include <Esmart/Esmart_Text_Entry.h>
-+#endif
-+#ifdef EFL_SUPPORT_EMOTION
- #include <Emotion.h>
-+#endif
- }
- 
- /* STD */
diff --git a/packages/efl++/files/fix-src.pro.patch b/packages/efl++/files/fix-src.pro.patch
deleted file mode 100644
index 234d38af3d..0000000000
--- a/packages/efl++/files/fix-src.pro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- efl++-0.1.0/src/src.pro~fix-src.pro
-+++ efl++-0.1.0/src/src.pro
-@@ -30,6 +30,7 @@
-     include ( emotion/emotion.pro )
-     LIBS += -lemotion
- 	DEFINES += EFL_SUPPORT_EMOTION
-+}
- 
- eflesmart {
-     include ( esmart/esmart.pro )
diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb
new file mode 100644
index 0000000000..c8c613d75e
--- /dev/null
+++ b/packages/efl1/eflpp_cvs.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "EFLpp are C++ bindings to the EFL"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/"
+LICENSE = "LGPL"
+DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0"
+PV = "0.1.0+cvs${SRCDATE}"
+
+inherit efl_library
+
+SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME}"