From 4f05db37d7d5624dc369ae502513e2fdb8e6476d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 10 Oct 2010 23:16:11 +0200 Subject: libgpepimc: convert to new-style staging * remove unused versions * re-stylize * bump PR --- recipes/libgpepimc/libgpepimc.inc | 27 ++++++++++++--------------- recipes/libgpepimc/libgpepimc_0.2.bb | 28 ---------------------------- recipes/libgpepimc/libgpepimc_0.3.bb | 26 -------------------------- recipes/libgpepimc/libgpepimc_0.4.bb | 26 -------------------------- recipes/libgpepimc/libgpepimc_0.5.bb | 4 ---- recipes/libgpepimc/libgpepimc_0.6.bb | 4 ---- recipes/libgpepimc/libgpepimc_0.8.bb | 4 ---- recipes/libgpepimc/libgpepimc_pc.patch | 23 ----------------------- recipes/libgpepimc/libgpepimc_svn.bb | 18 +++++++++--------- 9 files changed, 21 insertions(+), 139 deletions(-) delete mode 100644 recipes/libgpepimc/libgpepimc_0.2.bb delete mode 100644 recipes/libgpepimc/libgpepimc_0.3.bb delete mode 100644 recipes/libgpepimc/libgpepimc_0.4.bb delete mode 100644 recipes/libgpepimc/libgpepimc_0.5.bb delete mode 100644 recipes/libgpepimc/libgpepimc_0.6.bb delete mode 100644 recipes/libgpepimc/libgpepimc_0.8.bb delete mode 100644 recipes/libgpepimc/libgpepimc_pc.patch (limited to 'recipes') diff --git a/recipes/libgpepimc/libgpepimc.inc b/recipes/libgpepimc/libgpepimc.inc index bec560b46d..ec775df341 100644 --- a/recipes/libgpepimc/libgpepimc.inc +++ b/recipes/libgpepimc/libgpepimc.inc @@ -1,24 +1,21 @@ -LICENSE = "LGPL" -PR = "r2" DESCRIPTION = "Common code for GPE PIMs" SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget gtk+ sqlite" -PROVIDES = "libgepepimc" -RPROVIDES_${PN} = "libgepepimc" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "libgpewidget gtk+ sqlite" +PROVIDES = "libgepepimc" +RPROVIDES_${PN} = "libgepepimc" -SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2" +SRC_URI = "${GPE_MIRROR}/libgpepimc-${PV}.tar.bz2" inherit pkgconfig autotools headers = "pim-categories.h pim-categories-ui.h" -do_stage () { - oe_libinstall -so libgpepimc ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h - done +do_install () { + oe_libinstall -so libgpepimc ${D}${libdir} + install -d ${D}${includedir}/gpe + for h in ${headers}; do + install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h + done } - diff --git a/recipes/libgpepimc/libgpepimc_0.2.bb b/recipes/libgpepimc/libgpepimc_0.2.bb deleted file mode 100644 index f7887db43b..0000000000 --- a/recipes/libgpepimc/libgpepimc_0.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "Common code for GPE PIMs" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite" - -inherit pkgconfig gpe - -SRC_URI += "file://libgpepimc_pc.patch" - -headers = "pim-categories.h pim-categories-ui.h" - -do_stage () { - oe_libinstall -so libgpepimc ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h - done -} - -do_install () { - gpe_do_install - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel -} - -SRC_URI[md5sum] = "74e36fd1c34dc668801366d5aa11e93e" -SRC_URI[sha256sum] = "19556cc4d3469f61c7b50db7a9979a669af0b03c0c2243441e34a8a5f737fa9d" diff --git a/recipes/libgpepimc/libgpepimc_0.3.bb b/recipes/libgpepimc/libgpepimc_0.3.bb deleted file mode 100644 index 8bd789b8f8..0000000000 --- a/recipes/libgpepimc/libgpepimc_0.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "Common code for GPE PIMs" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite" - -inherit pkgconfig gpe - -headers = "pim-categories.h pim-categories-ui.h" - -do_stage () { - oe_libinstall -so libgpepimc ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h - done -} - -do_install () { - gpe_do_install - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel -} - -SRC_URI[md5sum] = "5142dd86386e1106a29f90837f57c3eb" -SRC_URI[sha256sum] = "f6a27c361b7ca41e32f4fedcf588e19745437ad5955fa68612ed21f45e828fc5" diff --git a/recipes/libgpepimc/libgpepimc_0.4.bb b/recipes/libgpepimc/libgpepimc_0.4.bb deleted file mode 100644 index 3bee48e9a5..0000000000 --- a/recipes/libgpepimc/libgpepimc_0.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -LICENSE = "LGPL" -DESCRIPTION = "Common code for GPE PIMs" -SECTION = "gpe/libs" -PRIORITY = "optional" -DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite" - -inherit pkgconfig gpe - -headers = "pim-categories.h pim-categories-ui.h" - -do_stage () { - oe_libinstall -so libgpepimc ${STAGING_LIBDIR} - - mkdir -p ${STAGING_INCDIR}/gpe - for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h - done -} - -do_install () { - gpe_do_install - oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel -} - -SRC_URI[md5sum] = "7aaa9220d1ffa77b70c1cf8355141b29" -SRC_URI[sha256sum] = "260c329ca2e197e8c85f21da4186cf8a4746ad0398fb708fbb266453f570734a" diff --git a/recipes/libgpepimc/libgpepimc_0.5.bb b/recipes/libgpepimc/libgpepimc_0.5.bb deleted file mode 100644 index 9c58b27ecf..0000000000 --- a/recipes/libgpepimc/libgpepimc_0.5.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libgpepimc.inc - -SRC_URI[md5sum] = "bbb0efe3359510fc0393f3f305c1c6e7" -SRC_URI[sha256sum] = "b0d1236dbb27f054f8b8a6f8ed4d735db89eb466be641bed67363f4dd76385ad" diff --git a/recipes/libgpepimc/libgpepimc_0.6.bb b/recipes/libgpepimc/libgpepimc_0.6.bb deleted file mode 100644 index 5818b80638..0000000000 --- a/recipes/libgpepimc/libgpepimc_0.6.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libgpepimc.inc - -SRC_URI[md5sum] = "3e5ffa6c4e556c5ccc8ec8f53a27eb69" -SRC_URI[sha256sum] = "71c7d6ab2ca142f100241d5256c58b67ac01a3d34d52722178e4da9d6ac0729f" diff --git a/recipes/libgpepimc/libgpepimc_0.8.bb b/recipes/libgpepimc/libgpepimc_0.8.bb deleted file mode 100644 index a67907f2fd..0000000000 --- a/recipes/libgpepimc/libgpepimc_0.8.bb +++ /dev/null @@ -1,4 +0,0 @@ -require libgpepimc.inc - -SRC_URI[md5sum] = "308f75a47ab738cb2955f8a8051728e5" -SRC_URI[sha256sum] = "b914f2cf05353e2f4471648b37782a82d73ebf895a50ab1e238e3a325cce2c65" diff --git a/recipes/libgpepimc/libgpepimc_pc.patch b/recipes/libgpepimc/libgpepimc_pc.patch deleted file mode 100644 index 7d4f5f7274..0000000000 --- a/recipes/libgpepimc/libgpepimc_pc.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u libgpepimc-0.2.orig/libgpepimc.pc.in libgpepimc-0.2/libgpepimc.pc.in ---- libgpepimc-0.2.orig/libgpepimc.pc.in 2004-02-18 07:33:19.000000000 +1100 -+++ libgpepimc-0.2/libgpepimc.pc.in 2004-04-23 15:52:38.000000000 +1000 -@@ -6,6 +6,6 @@ - Name: libgpevtype - Description: GPE PIM Categories Library - Version: VERSION --Requires: gtk-2.0 -+Requires: gtk+-2.0 - Libs: -L${libdir} -lgpepimc - Cflags: -I${includedir} -diff -u libgpepimc-0.2.orig/libgpepimc-uninstalled.pc.in libgpepimc-0.2/libgpepimc-uninstalled.pc.in ---- libgpepimc-0.2.orig/libgpepimc-uninstalled.pc.in 2004-02-18 07:33:38.000000000 +1100 -+++ libgpepimc-0.2/libgpepimc-uninstalled.pc.in 2004-04-23 15:52:48.000000000 +1000 -@@ -1,6 +1,6 @@ - Name: libgpevtype - Description: GPE PIM Categories Library (not installed) - Version: VERSION --Requires: gtk-2.0 -+Requires: gtk+-2.0 - Libs: -LBUILDDIR -lgpepimc - Cflags: -IBUILDDIR -Common subdirectories: libgpepimc-0.2.orig/po and libgpepimc-0.2/po diff --git a/recipes/libgpepimc/libgpepimc_svn.bb b/recipes/libgpepimc/libgpepimc_svn.bb index cd169b465c..621ac39917 100644 --- a/recipes/libgpepimc/libgpepimc_svn.bb +++ b/recipes/libgpepimc/libgpepimc_svn.bb @@ -6,22 +6,22 @@ DEPENDS = "libgpewidget gtk+ sqlite" PROVIDES = "libgepepimc" RPROVIDES_${PN} = "libgepepimc" PV = "0.8+svn${SRCDATE}" -PR = "r1" - -inherit pkgconfig autotools +PR = "r2" SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" -do_stage () { - oe_libinstall -so libgpepimc ${STAGING_LIBDIR} - mkdir -p ${STAGING_INCDIR}/gpe +inherit pkgconfig autotools + +headers = "pim-categories.h pim-categories-ui.h" + +do_install () { + oe_libinstall -so libgpepimc ${D}${libdir} + install -d ${D}${includedir}/gpe for h in ${headers}; do - install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h + install -m 0644 ${S}/gpe/$h ${D}${includedir}/gpe/$h done } -headers = "pim-categories.h pim-categories-ui.h" - DEFAULT_PREFERENCE = "-1" -- cgit 1.2.3-korg