4 files changed, 4 insertions, 116 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libqpe/libqpe-opie.inc
diff --git a/packages/libqpe/libqpe-opie_1.1.9.bb b/packages/libqpe/libqpe-opie_1.1.9.bb
deleted file mode 100644
index c29ce9bd5d..0000000000
--- a/packages/libqpe/libqpe-opie_1.1.9.bb
+++ /dev/null
@@ -1,58 +0,0 @@
-DESCRIPTION = "Base library for the Qt Palmtop Environment"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc-native qte"
-PROVIDES = "virtual/libqpe"
-PR = "r2"
-
-TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
-	file://nomax.patch;patch=1;pnum=1"
-	
-S = "${WORKDIR}/library"
-
-inherit qmake
-
-QMAKE_PROFILES = "library.pro"
-EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
-EXTRA_QMAKEVARS_POST = "DESTDIR="
-
-CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
-CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-
-do_compile() {
-        mkdir -p ${STAGING_INCDIR}/qpe \
-                 ${STAGING_INCDIR}/qtopia \
-                 ${STAGING_INCDIR}/opie \
-                 ${STAGING_INCDIR}/opie2 \
-                 ${STAGING_INCDIR}/qtopia/private
-	for i in ${S}/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	for i in ${S}/backend/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
-}
-
-do_stage() {
-	oe_libinstall -so libqpe ${STAGING_LIBDIR}
-	# include files already done during do_compile
-}
-
-do_install() {
-	oe_libinstall -so libqpe ${D}${palmtopdir}/lib
-}
-
-PACKAGES = "libqpe1"
-FILES_libqpe1 = "${palmtopdir}/lib"
diff --git a/packages/libqpe/libqpe-opie_1.2.0.bb b/packages/libqpe/libqpe-opie_1.2.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libqpe/libqpe-opie_1.2.0.bb
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 96a838c85e..34cb89ef1e 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,61 +1,7 @@
-DESCRIPTION = "Base library for the Qt Palmtop Environment"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-DEPENDS = "uicmoc-native qte"
-PROVIDES = "virtual/libqpe"
-PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r6"
+include ${PN}.inc
+    
+PV = "1.2.0+cvs-${CVSDATE}"
+PR = "r0"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library"
-S = "${WORKDIR}/library"
 
-inherit qmake
-
-QMAKE_PROFILES = "library.pro"
-EXTRA_QMAKEVARS_PRE  = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
-EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
-# EXTRA_QMAKEVARS_POST = "DESTDIR="
-
-CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC  -fno-rtti -fno-exceptions"
-CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED "
-CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED "
-
-do_compile_prepend_ramses () {
-	ln -s custom-ramses.h custom.h
-}
-
-do_compile() {
-        mkdir -p ${STAGING_INCDIR}/qpe \
-                 ${STAGING_INCDIR}/qtopia \
-                 ${STAGING_INCDIR}/opie \
-                 ${STAGING_INCDIR}/opie2 \
-                 ${STAGING_INCDIR}/qtopia/private
-	for i in ${S}/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	for i in ${S}/backend/*.h
-	do
-		install -m 0644 $i ${STAGING_INCDIR}/qpe/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/`basename $i`
-		install -m 0644 $i ${STAGING_INCDIR}/qtopia/private/`basename $i`
-	done
-	rm -f ${STAGING_INCDIR}/qtopia/*_p.h # remove private stuff out of qtopia
-	oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic
-}
-
-do_stage() {
-	oe_libinstall -so libqpe ${STAGING_LIBDIR}
-	# include files already done during do_compile
-}
-
-do_install() {
-	oe_libinstall -so libqpe ${D}${palmtopdir}/lib
-}
-
-PACKAGES = "libqpe1"
-FILES_libqpe1 = "${palmtopdir}/lib"