libgpewidget: inherit gpe. clean things up a bit.

6 files changed, 30 insertions, 33 deletions

diff --git a/packages/libgpewidget/libgpewidget_0.102.bb b/packages/libgpewidget/libgpewidget_0.102.bb
index 35f09b5c21..58e8c71c18 100644
--- a/packages/libgpewidget/libgpewidget_0.102.bb
+++ b/packages/libgpewidget/libgpewidget_0.102.bb
@@ -1,15 +1,15 @@
 LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
 
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-		file://cairo.patch;patch=1;pnum=1"
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
 
-inherit pkgconfig autotools
+SRC_URI += "file://cairo.patch;patch=1;pnum=1"
 
 EXTRA_OECONF = "--enable-cairo"
 
diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb
index 0d8dcf23cf..b174398670 100644
--- a/packages/libgpewidget/libgpewidget_0.103.bb
+++ b/packages/libgpewidget/libgpewidget_0.103.bb
@@ -1,14 +1,13 @@
 LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
 
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-inherit pkgconfig autotools
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
 
 EXTRA_OECONF = "--enable-cairo"
 
diff --git a/packages/libgpewidget/libgpewidget_0.105.bb b/packages/libgpewidget/libgpewidget_0.105.bb
index f7d45ff0e8..884c55c9d3 100644
--- a/packages/libgpewidget/libgpewidget_0.105.bb
+++ b/packages/libgpewidget/libgpewidget_0.105.bb
@@ -3,11 +3,11 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r1"
 
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-inherit pkgconfig autotools
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
 
 EXTRA_OECONF = "--enable-cairo"
 
diff --git a/packages/libgpewidget/libgpewidget_0.107.bb b/packages/libgpewidget/libgpewidget_0.107.bb
index 3bd2996e67..6ebab6db35 100644
--- a/packages/libgpewidget/libgpewidget_0.107.bb
+++ b/packages/libgpewidget/libgpewidget_0.107.bb
@@ -2,14 +2,13 @@ LICENSE = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r1"
 
-PACKAGES =+ "libgpewidget-bin"
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2"
-
-inherit pkgconfig autotools
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
 
+PACKAGES =+ "libgpewidget-bin"
 FILES_libgpewidget-bin = "${bindir}"
 
 EXTRA_OECONF = "--enable-cairo"
diff --git a/packages/libgpewidget/libgpewidget_0.109.bb b/packages/libgpewidget/libgpewidget_0.109.bb
index bab62fd3dc..f1078860d7 100644
--- a/packages/libgpewidget/libgpewidget_0.109.bb
+++ b/packages/libgpewidget/libgpewidget_0.109.bb
@@ -2,23 +2,22 @@ LICENSE     = "LGPL"
 DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
 SECTION     = "gpe/libs"
 PRIORITY    = "optional"
-DEPENDS     = "gtk+ cairo libxrender gtk-doc intltool-native"
+DEPENDS     = "gtk+ cairo libxrender gtk-doc"
 MAINTAINER  = "Florian Boor <florian.boor@kernelconcepts.de>"
-PR          = "r1"
+PR          = "r2"
 
-PACKAGES =+ "libgpewidget-bin"
-
-PARALLEL_MAKE = ""
-
-SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2 \
-           file://pkgconfig.patch;patch=1;pnum=0"
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
 
-inherit pkgconfig autotools
+SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
 
+PACKAGES =+ "libgpewidget-bin"
 FILES_libgpewidget-bin = "${bindir}"
 
 EXTRA_OECONF = "--enable-cairo"
 
+PARALLEL_MAKE = ""
+
 LDFLAGS += " -L${STAGING_LIBDIR}" 
 
 do_stage () {
diff --git a/packages/libgpewidget/libgpewidget_cvs.bb b/packages/libgpewidget/libgpewidget_cvs.bb
index 6e60b95133..e321d51c7d 100644
--- a/packages/libgpewidget/libgpewidget_cvs.bb
+++ b/packages/libgpewidget/libgpewidget_cvs.bb
@@ -2,19 +2,19 @@ DESCRIPTION = "libgpewidget contains a collection of widgets and other common co
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
-DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
 
 
 LICENSE = "LGPL"
 DEFAULT_PREFERENCE = "-1"
 
 S =  "${WORKDIR}/${PN}"
-PV = "0.107+cvs${SRCDATE}"
+PV = "0.109+cvs${SRCDATE}"
 PR = "r0"
 
-inherit autotools pkgconfig
+inherit gpe autotools pkgconfig
 
-SRC_URI =   "${HANDHELDS_CVS};module=gpe/base/${PN}"
+SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}"
 
 EXTRA_OECONF = "--enable-cairo"