diff options
61 files changed, 273 insertions, 483 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7375ac5f50..20892a9ffd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -178,6 +178,7 @@ Distros: Ångström Machines: collie, spitz Recipes: anthy, nunome, uim*, granule, qpobox*, qte-font-unifont* Recipes: qpf-unismall, qpobox, poboxserver, imkit*, scim, zten +Recipes: eb, eblook Person: Shane Volpe Mail: shanevolpe@gmail.com diff --git a/packages/classpath/classpath-gtk_0.90.bb b/packages/classpath/classpath-gtk_0.90.bb deleted file mode 100644 index b83d23d9c0..0000000000 --- a/packages/classpath/classpath-gtk_0.90.bb +++ /dev/null @@ -1,16 +0,0 @@ -require classpath.inc - -DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" -RDEPENDS_${PBN}-gtk = "${PBN}-common (>= ${PV})" -RCONFLICTS_${PBN}-gtk = "${PBN}-minimal" - -EXTRA_OECONF = "--with-jikes" - -PACKAGES = "${PBN}-dev ${PBN}-doc ${PBN}-common ${PBN}-examples ${PBN}-tools ${PN}" - -FILES_${PBN}-doc = "${datadir}/info" -FILES_${PBN}-dev = "${includedir}" -FILES_${PN} = "${libdir}" -FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip" -FILES_${PBN}-examples = "${datadir}/${PBN}/examples" -FILES_${PBN}-tools = "${datadir}/${PBN}/tools" diff --git a/packages/classpath/classpath-gtk_0.93.bb b/packages/classpath/classpath-gtk_0.93.bb new file mode 100644 index 0000000000..137ee8ffb2 --- /dev/null +++ b/packages/classpath/classpath-gtk_0.93.bb @@ -0,0 +1,18 @@ +require classpath.inc + +DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst jikes-native zip-native" +RDEPENDS_${PN} = "classpath-common (>= ${PV})" +RCONFLICTS_${PN} = "classpath-minimal" + +SRC_URI += "file://gconf_version.patch;patch=1" + +EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi" + +PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" + +FILES_classpath-doc = "${datadir}/info" +FILES_classpath-dev = "${includedir}" +FILES_${PN} = "${libdir} ${bindir}" +FILES_classpath-common = "${datadir}/classpath/glibj.zip" +FILES_classpath-examples = "${datadir}/classpath/examples" +FILES_classpath-tools = "${datadir}/classpath/tools.zip" diff --git a/packages/classpath/classpath-gtk_cvs.bb b/packages/classpath/classpath-gtk_cvs.bb new file mode 100644 index 0000000000..53f494ab15 --- /dev/null +++ b/packages/classpath/classpath-gtk_cvs.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "GNU Classpath standard Java libraries" +HOMEPAGE = "http://www.gnu.org/software/classpath/" +LICENSE = "Classpath" +PRIORITY = "optional" +SECTION = "libs" +PR = "r1" + +SRCDATE_${PN} ?= "20070501" +PV = "0.93+cvs${SRCDATE}" + +DEPENDS = "glib-2.0 gtk+ cairo gconf ecj-native zip-native" +RDEPENDS_${PN} = "classpath-common (>= ${PV})" +RCONFLICTS_${PN} = "classpath-minimal" + +SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \ + file://disable-automake-checks-v2.patch;patch=1" + +S = "${WORKDIR}/classpath" + +inherit autotools + +EXTRA_OECONF = "--with-ecj=${STAGING_BINDIR_NATIVE}/ecj --with-ecj-jar=${STAGING_BINDIR_NATIVE}/ecj.jar --disable-plugin --disable-dssi --disable-alsa" + +PACKAGES = "classpath-dev classpath-doc classpath-common classpath-examples classpath-tools ${PN}" + +FILES_classpath-doc = "${datadir}/info ${datadir}/man" +FILES_classpath-dev = "${includedir}" +FILES_${PN} = "${libdir} ${bindir}" +FILES_classpath-common = "${datadir}/classpath/glibj.zip" +FILES_classpath-examples = "${datadir}/classpath/examples" +FILES_classpath-tools = "${datadir}/classpath/tools.zip" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + autotools_do_install + mv ${D}${libdir}/security ${D}${libdir}/${PN} +} + +PROVIDES = "classpath" +RPROVIDES = "classpath" diff --git a/packages/classpath/classpath-minimal-native_0.93.bb b/packages/classpath/classpath-minimal-native_0.93.bb new file mode 100644 index 0000000000..8a08a6c1ce --- /dev/null +++ b/packages/classpath/classpath-minimal-native_0.93.bb @@ -0,0 +1,20 @@ +require classpath.inc + +DEPENDS = "glib-2.0 libart-lgpl pango libxtst jikes-native zip-native" + +SRC_URI += "file://gconf_version.patch;patch=1" + +inherit native + +EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples" + +do_stage() { + install -d ${STAGING_INCDIR}/classpath + install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ + install -d ${STAGING_DATADIR}/classpath + install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/ +} + +do_install() { + : +} diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index 303c286d4e..e66f5d7456 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -1,17 +1,15 @@ DESCRIPTION = "GNU Classpath standard Java libraries" HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Classpath" +PROVIDES = "classpath" +RPROVIDES = "classpath" -PBN = "classpath" - -SRC_URI = "${GNU_MIRROR}/classpath/${PBN}-${PV}.tar.gz \ +SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \ file://disable-automake-checks.patch;patch=1 \ file://fix-endian-arm-floats.patch;patch=1" -S = "${WORKDIR}/${PBN}-${PV}" - inherit autotools do_stage() { @@ -21,8 +19,11 @@ do_stage() { do_install() { autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PBN} + mv ${D}${libdir}/security ${D}${libdir}/${PN} } -PROVIDES = "classpath" -RPROVIDES = "classpath" +PACKAGES =+ "classpath-common classpath-examples classpath-tools" +FILES_classpath-common += "${datadir}/classpath/glibj.zip" +FILES_classpath-examples += "${datadir}/classpath/examples" +FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools" +FILES_classpath-dev += "${libdir}/*.so" diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb index 439d973cc8..e4d73bbd3a 100644 --- a/packages/classpath/classpath_0.14.bb +++ b/packages/classpath/classpath_0.14.bb @@ -1,32 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" +PR = "r2" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ file://disable-automake-checks.patch;patch=1" -inherit autotools - EXTRA_OECONF = "--with-jikes" - -PACKAGES += " ${PN}-common ${PN}-examples" - -FILES_${PN} = "${libdir}/${PN}" -FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" -FILES_${PN}-examples = "${datadir}/${PN}/examples" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb index 439d973cc8..e4d73bbd3a 100644 --- a/packages/classpath/classpath_0.15.bb +++ b/packages/classpath/classpath_0.15.bb @@ -1,32 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" +PR = "r2" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ file://disable-automake-checks.patch;patch=1" -inherit autotools - EXTRA_OECONF = "--with-jikes" - -PACKAGES += " ${PN}-common ${PN}-examples" - -FILES_${PN} = "${libdir}/${PN}" -FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" -FILES_${PN}-examples = "${datadir}/${PN}/examples" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb index a28591ac0d..e4d73bbd3a 100644 --- a/packages/classpath/classpath_0.17.bb +++ b/packages/classpath/classpath_0.17.bb @@ -1,32 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" -PR = "r1" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (${PV})" +PR = "r2" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ file://disable-automake-checks.patch;patch=1" -inherit autotools - EXTRA_OECONF = "--with-jikes" - -PACKAGES += " ${PN}-common ${PN}-examples" - -FILES_${PN} = "${libdir}/${PN}" -FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" -FILES_${PN}-examples = "${datadir}/${PN}/examples" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.18.bb b/packages/classpath/classpath_0.18.bb index a9a2b2cd2d..9b9e8c3451 100644 --- a/packages/classpath/classpath_0.18.bb +++ b/packages/classpath/classpath_0.18.bb @@ -1,31 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +PR = "r1" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ file://disable-automake-checks.patch;patch=1" -inherit autotools - EXTRA_OECONF = "--with-jikes" - -PACKAGES += " ${PN}-common ${PN}-examples" - -FILES_${PN} = "${libdir}/${PN}" -FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" -FILES_${PN}-examples = "${datadir}/${PN}/examples" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.19.bb b/packages/classpath/classpath_0.19.bb index a9a2b2cd2d..9b9e8c3451 100644 --- a/packages/classpath/classpath_0.19.bb +++ b/packages/classpath/classpath_0.19.bb @@ -1,31 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +PR = "r1" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ file://disable-automake-checks.patch;patch=1" -inherit autotools - EXTRA_OECONF = "--with-jikes" - -PACKAGES += " ${PN}-common ${PN}-examples" - -FILES_${PN} = "${libdir}/${PN}" -FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" -FILES_${PN}-examples = "${datadir}/${PN}/examples" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/classpath_0.20.bb b/packages/classpath/classpath_0.20.bb index a9a2b2cd2d..9b9e8c3451 100644 --- a/packages/classpath/classpath_0.20.bb +++ b/packages/classpath/classpath_0.20.bb @@ -1,31 +1,10 @@ -DESCRIPTION = "GNU Classpath standard Java libraries" -HOMEPAGE = "http://www.gnu.org/software/classpath/" -LICENSE = "Classpath" -PRIORITY = "optional" -SECTION = "libs" +require classpath.inc DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst jikes-native zip-native" RDEPENDS_${PN} = "${PN}-common (>= ${PV})" +PR = "r1" SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \ file://disable-automake-checks.patch;patch=1" -inherit autotools - EXTRA_OECONF = "--with-jikes" - -PACKAGES += " ${PN}-common ${PN}-examples" - -FILES_${PN} = "${libdir}/${PN}" -FILES_${PN}-common = "${datadir}/${PN}/glibj.zip" -FILES_${PN}-examples = "${datadir}/${PN}/examples" - -do_stage() { - install -d ${STAGING_INCDIR}/classpath - install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/ -} - -do_install() { - autotools_do_install - mv ${D}${libdir}/security ${D}${libdir}/${PN} -} diff --git a/packages/classpath/files/disable-automake-checks-v2.patch b/packages/classpath/files/disable-automake-checks-v2.patch new file mode 100644 index 0000000000..0c1df1acae --- /dev/null +++ b/packages/classpath/files/disable-automake-checks-v2.patch @@ -0,0 +1,11 @@ +--- sablevm-classpath-1.1.7/configure.ac.orig 2004-11-26 00:23:01.000000000 +0100 ++++ sablevm-classpath-1.1.7/configure.ac 2004-11-26 00:23:46.000000000 +0100 +@@ -34,7 +34,7 @@ + AC_SUBST(CLASSPATH_MODULE) + + AC_PREREQ(2.59) +-AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability]) ++AM_INIT_AUTOMAKE + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local) + diff --git a/packages/classpath/files/gconf_version.patch b/packages/classpath/files/gconf_version.patch new file mode 100644 index 0000000000..b1be1209a2 --- /dev/null +++ b/packages/classpath/files/gconf_version.patch @@ -0,0 +1,11 @@ +--- classpath-0.93/configure.ac~ 2007-03-29 15:52:30.000000000 -0500 ++++ classpath-0.93/configure.ac 2007-03-29 15:52:30.000000000 -0500 +@@ -496,7 +496,7 @@ + + dnl gconf-peer + if test "x${COMPILE_GCONF_PEER}" = xyes; then +- PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2) ++ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.0) + AC_SUBST(GCONF_CFLAGS) + AC_SUBST(GCONF_LIBS) + dnl we also need gdk for locking diff --git a/packages/elfutils/elfutils-0.108/.mtn2git_empty b/packages/elfutils/elfutils-0.127/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/elfutils/elfutils-0.108/.mtn2git_empty +++ b/packages/elfutils/elfutils-0.127/.mtn2git_empty diff --git a/packages/elfutils/elfutils-0.108/warnings.patch b/packages/elfutils/elfutils-0.127/warnings.patch index 9de027ee26..c2e7fc2f3d 100644 --- a/packages/elfutils/elfutils-0.108/warnings.patch +++ b/packages/elfutils/elfutils-0.127/warnings.patch @@ -2,7 +2,7 @@ Index: elfutils-0.108/configure.ac =================================================================== --- elfutils-0.108.orig/configure.ac 2006-04-10 19:18:34.000000000 +0100 +++ elfutils-0.108/configure.ac 2006-04-10 19:19:33.000000000 +0100 -@@ -49,6 +49,10 @@ +@@ -55,6 +55,10 @@ dnl Add all the languages for which translations are available. ALL_LINGUAS= @@ -17,7 +17,7 @@ Index: elfutils-0.108/lib/Makefile.am =================================================================== --- elfutils-0.108.orig/lib/Makefile.am 2006-04-10 19:18:34.000000000 +0100 +++ elfutils-0.108/lib/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -21,7 +21,7 @@ +@@ -30,7 +30,7 @@ else AM_CFLAGS = endif @@ -28,15 +28,16 @@ Index: elfutils-0.108/lib/Makefile.am noinst_LIBRARIES = libeu.a Index: elfutils-0.108/libasm/Makefile.am =================================================================== ---- elfutils-0.108.orig/libasm/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/libasm/Makefile.am 2006-04-10 19:19:33.000000000 +0100 -@@ -18,7 +18,7 @@ +--- elfutils-0.127.orig/libasm/Makefile.am 2006-04-10 19:18:34.000000000 +0100 ++++ elfutils-0.127/libasm/Makefile.am 2006-04-10 19:19:33.000000000 +0100 +@@ -30,7 +30,7 @@ else AM_CFLAGS = endif --AM_CFLAGS += -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 -+AM_CFLAGS += -Wshadow -Wunused -Wformat=2 - INCLUDES = -I. -I$(srcdir) -I.. -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl \ +-AM_CFLAGS += -std=gnu99 -Wall -Wshadow -Werror -Wunused -Wextra -Wformat=2 ++AM_CFLAGS += -std=gnu99 -Wshadow -Wunused -Wformat=2 + INCLUDES = -I. -I$(srcdir) -I.. \ + -I$(top_srcdir)/libelf -I$(top_srcdir)/libebl -I$(top_srcdir)/libdw\ -I$(top_srcdir)/lib GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) Index: elfutils-0.108/libcpu/Makefile.am @@ -91,28 +92,6 @@ Index: elfutils-0.108/libelf/Makefile.am $($(*F)_CFLAGS) INCLUDES = -I$(srcdir) -I$(top_srcdir)/lib -I.. GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) -Index: elfutils-0.108/src/Makefile.am -=================================================================== ---- elfutils-0.108.orig/src/Makefile.am 2006-04-10 19:18:34.000000000 +0100 -+++ elfutils-0.108/src/Makefile.am 2006-04-10 19:20:19.000000000 +0100 -@@ -15,14 +15,12 @@ - DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H $(YYDEBUG) \ - -DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\" - if MUDFLAP --AM_CFLAGS = -Wall -Wshadow -Wunused -Wextra -std=gnu99 -fmudflap \ -+AM_CFLAGS = -Wshadow -Wunused -std=gnu99 -fmudflap \ - $(native_ld_cflags) $(if $($(*F)_no_Wunused),,-Wunused) \ - $(if $($(*F)_no_Wformat),,-Wformat=2) - else --AM_CFLAGS = -Wall -Wshadow -std=gnu99 $(native_ld_cflags) \ -- $(if $($(*F)_no_Werror),,-Werror) \ -- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ -- $(if $($(*F)_no_Wformat),,-Wformat=2) -+AM_CFLAGS = -Wshadow -std=gnu99 $(native_ld_cflags) \ -+ $(if $($(*F)_no_Werror),,-Werror) - endif - if MUDFLAP - libmudflap = -lmudflap Index: elfutils-0.108/tests/Makefile.am =================================================================== --- elfutils-0.108.orig/tests/Makefile.am 2006-04-10 19:18:34.000000000 +0100 @@ -121,12 +100,13 @@ Index: elfutils-0.108/tests/Makefile.am ## DEFS = -DHAVE_CONFIG_H -D_GNU_SOURCE if MUDFLAP --AM_CFLAGS = -Wall -Werror -std=gnu99 -fmudflap\ +-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 -fmudflap\ +AM_CFLAGS = -std=gnu99 -fmudflap\ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) + BUILD_RPATH = \$$ORIGIN/../backends else --AM_CFLAGS = -Wall -Werror -std=gnu99 \ +-AM_CFLAGS = -Wall -Werror -Wextra -std=gnu99 \ +AM_CFLAGS = -std=gnu99 \ $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2) - AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf + BUILT_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf endif diff --git a/packages/elfutils/elfutils_0.108.bb b/packages/elfutils/elfutils_0.108.bb deleted file mode 100644 index 83acc7dccb..0000000000 --- a/packages/elfutils/elfutils_0.108.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "base" -LICENSE = "OSL" -DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects." -DEPENDS = "libtool" - -SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ - file://warnings.patch;patch=1" - -inherit autotools - -SOV = "${PV}" -do_stage () { - install -m 0644 libelf/libelf.a ${STAGING_LIBDIR}/libelf.a - install -m 0755 libelf/libelf.so.1 ${STAGING_LIBDIR}/libelf-${SOV}.so - ln -sf libelf-${SOV}.so ${STAGING_LIBDIR}/libelf.so.1 - ln -sf libelf.so.1 ${STAGING_LIBDIR}/libelf.so - install -m 0644 libasm/libasm.a ${STAGING_LIBDIR}/libasm.a - install -m 0755 libasm/libasm.so.1 ${STAGING_LIBDIR}/libasm-${SOV}.so - ln -sf libasm-${SOV}.so ${STAGING_LIBDIR}/libasm.so.1 - ln -sf libasm.so.1 ${STAGING_LIBDIR}/libasm.so - install -m 0644 libdw/libdw.a ${STAGING_LIBDIR}/libdw.a - install -m 0755 libdw/libdw.so.1 ${STAGING_LIBDIR}/libdw-${SOV}.so - ln -sf libdw-${SOV}.so ${STAGING_LIBDIR}/libdw.so.1 - ln -sf libdw.so.1 ${STAGING_LIBDIR}/libdw.so - install -m 0644 libebl/libebl.a ${STAGING_LIBDIR}/libebl.a - install -d ${STAGING_LIBDIR}/elfutils/ - install -m 0755 libebl/libebl_*.so ${STAGING_LIBDIR}/elfutils/ - - install -m 0644 ${S}/libelf/libelf.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/libelf/gelf.h ${STAGING_INCDIR}/ - install -m 0644 ${S}/libelf/nlist.h ${STAGING_INCDIR}/ - install -d ${STAGING_INCDIR}/elfutils - install -m 0644 ${S}/libebl/libebl.h ${STAGING_INCDIR}/elfutils/ - install -m 0644 ${S}/libdw/libdw.h ${STAGING_INCDIR}/elfutils/ - install -m 0644 ${S}/libasm/libasm.h ${STAGING_INCDIR}/elfutils/ -} diff --git a/packages/elfutils/elfutils_0.127.bb b/packages/elfutils/elfutils_0.127.bb new file mode 100644 index 0000000000..22f3b0ae46 --- /dev/null +++ b/packages/elfutils/elfutils_0.127.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A collection of utilities and DSOs to handle compiled objects." +SECTION = "base" +LICENSE = "OSL" +DEPENDS = "libtool" + +SRC_URI = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-${PV}.tar.gz \ + file://warnings.patch;patch=1" + +inherit autotools + +do_stage () { + autotools_stage_all +} + + diff --git a/packages/glibmm/glibmm_2.8.4.bb b/packages/glibmm/glibmm_2.8.4.bb index a1235ae563..1819114cb1 100644 --- a/packages/glibmm/glibmm_2.8.4.bb +++ b/packages/glibmm/glibmm_2.8.4.bb @@ -3,8 +3,8 @@ HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "gtk+ libsigc++-2.0" -PR = "r1" +DEPENDS = "glib-2.0 libsigc++-2.0" +PR = "r2" SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.8/glibmm-${PV}.tar.bz2" diff --git a/packages/gpe-timesheet/gpe-timesheet.inc b/packages/gpe-timesheet/gpe-timesheet.inc new file mode 100644 index 0000000000..11c1327752 --- /dev/null +++ b/packages/gpe-timesheet/gpe-timesheet.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "GPE time tracker" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "libgpewidget gtk+ sqlite libtododb" +RDEPENDS = "gpe-icons" + +inherit autotools gpe + +GPE_TARBALL_SUFFIX = "bz2" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.30.bb b/packages/gpe-timesheet/gpe-timesheet_0.30.bb index 1e995c2d81..c642bfacb5 100644 --- a/packages/gpe-timesheet/gpe-timesheet_0.30.bb +++ b/packages/gpe-timesheet/gpe-timesheet_0.30.bb @@ -1,9 +1,3 @@ -LICENSE = "GPL" -inherit autotools gpe +require gpe-timesheet.inc -DESCRIPTION = "GPE time tracker" -GPE_TARBALL_SUFFIX = "bz2" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -SECTION = "gpe" -RDEPENDS = "gpe-icons" PR = "r1" diff --git a/packages/gpe-timesheet/gpe-timesheet_0.31.bb b/packages/gpe-timesheet/gpe-timesheet_0.31.bb index 1e995c2d81..c642bfacb5 100644 --- a/packages/gpe-timesheet/gpe-timesheet_0.31.bb +++ b/packages/gpe-timesheet/gpe-timesheet_0.31.bb @@ -1,9 +1,3 @@ -LICENSE = "GPL" -inherit autotools gpe +require gpe-timesheet.inc -DESCRIPTION = "GPE time tracker" -GPE_TARBALL_SUFFIX = "bz2" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -SECTION = "gpe" -RDEPENDS = "gpe-icons" PR = "r1" diff --git a/packages/gpe-timesheet/gpe-timesheet_svn.bb b/packages/gpe-timesheet/gpe-timesheet_svn.bb index 0eae00b1ca..28eb65d31b 100644 --- a/packages/gpe-timesheet/gpe-timesheet_svn.bb +++ b/packages/gpe-timesheet/gpe-timesheet_svn.bb @@ -1,13 +1,8 @@ -DESCRIPTION = "GPE time tracker" -SECTION = "gpe" -LICENSE = "GPL" -DEPENDS = "libgpewidget gtk+ sqlite libtododb" -RDEPENDS = "gpe-icons" +require gpe-timesheet.inc + PR = "r1" PV = "0.31+svn-${SRCDATE}" -inherit autotools - SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" diff --git a/packages/gpe-what/gpe-what.inc b/packages/gpe-what/gpe-what.inc new file mode 100644 index 0000000000..fd4307631e --- /dev/null +++ b/packages/gpe-what/gpe-what.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "GPE modal help" +SECTION = "gpe" +LICENSE = "GPL" +DEPENDS = "virtual/libx11 gtk+" + +inherit autotools gpe + +GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-what/gpe-what_0.30.bb b/packages/gpe-what/gpe-what_0.30.bb index 9c711a624d..165ea4cc3b 100644 --- a/packages/gpe-what/gpe-what_0.30.bb +++ b/packages/gpe-what/gpe-what_0.30.bb @@ -1,9 +1,4 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe - -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11" +require gpe-what.inc do_compile_prepend() { rm *.d diff --git a/packages/gpe-what/gpe-what_0.31.bb b/packages/gpe-what/gpe-what_0.31.bb index 362e573538..50a614bdd2 100644 --- a/packages/gpe-what/gpe-what_0.31.bb +++ b/packages/gpe-what/gpe-what_0.31.bb @@ -1,6 +1,3 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe +require gpe-what.inc -DESCRIPTION = "GPE modal help" DEPENDS = "virtual/libx11 libxpm libmatchbox" diff --git a/packages/gpe-what/gpe-what_0.33.bb b/packages/gpe-what/gpe-what_0.33.bb index ed7c7577ec..71ae7dac95 100644 --- a/packages/gpe-what/gpe-what_0.33.bb +++ b/packages/gpe-what/gpe-what_0.33.bb @@ -1,8 +1,5 @@ -LICENSE = "GPL" -SECTION = "gpe" -inherit gpe +require gpe-what.inc SRC_URI += "file://makefile-fix.patch;patch=1" -DESCRIPTION = "GPE modal help" DEPENDS = "virtual/libx11 libxpm libmatchbox" diff --git a/packages/gpe-what/gpe-what_0.41.bb b/packages/gpe-what/gpe-what_0.41.bb index 2cc0dc9c2f..853abec8aa 100644 --- a/packages/gpe-what/gpe-what_0.41.bb +++ b/packages/gpe-what/gpe-what_0.41.bb @@ -1,8 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" - - -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe - +require gpe-what.inc diff --git a/packages/gpe-what/gpe-what_0.42.bb b/packages/gpe-what/gpe-what_0.42.bb index 2cc0dc9c2f..853abec8aa 100644 --- a/packages/gpe-what/gpe-what_0.42.bb +++ b/packages/gpe-what/gpe-what_0.42.bb @@ -1,8 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" - - -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe - +require gpe-what.inc diff --git a/packages/gpe-what/gpe-what_0.43.bb b/packages/gpe-what/gpe-what_0.43.bb index b82da4ff7f..624f2e365e 100644 --- a/packages/gpe-what/gpe-what_0.43.bb +++ b/packages/gpe-what/gpe-what_0.43.bb @@ -1,9 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE modal help" -DEPENDS = "virtual/libx11 gtk+" -PR = "r1" +require gpe-what.inc -GPE_TARBALL_SUFFIX= "bz2" -inherit autotools gpe +PR = "r1" SRC_URI += " file://set-wm-hint.patch;patch=1;pnum=0" diff --git a/packages/gpe-what/gpe-what_svn.bb b/packages/gpe-what/gpe-what_svn.bb index 7ecaf20a2f..c448751096 100644 --- a/packages/gpe-what/gpe-what_svn.bb +++ b/packages/gpe-what/gpe-what_svn.bb @@ -1,9 +1,6 @@ -DESCRIPTION = "GPE modal help" -LICENSE = "GPL" -DEPENDS = "virtual/libx11 gtk+" -PV = "0.41+svn${SRCDATE}" +require gpe-what.inc -inherit autotools +PV = "0.41+svn${SRCDATE}" SRC_URI = "${GPE_SVN}" diff --git a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb index 33b0423e25..f44e8b57a6 100644 --- a/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb +++ b/packages/gtkhtml/gtkhtml-2.0_2.6.3.bb @@ -1,22 +1,15 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r0" -inherit gnome - SRC_URI = "http://ftp.debian.org/debian/pool/main/libg/libgtkhtml2/libgtkhtml2_2.6.3.orig.tar.gz" - FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/libgtkhtml2-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { - mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true + mv src/libgtkhtml.pc src/libgtkhtml-2.0.pc || true autotools_stage_all } diff --git a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb index d27f72ae4a..66993cec74 100644 --- a/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-3.0_3.0.10.bb @@ -1,18 +1,12 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui gal-2.0" PR = "r2" -inherit gnome - SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.0/gtkhtml-${PV}.tar.bz2 \ file://fix-missing-colormap.patch;patch=1" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb index 2b57a0b2c4..1e389dabe0 100644 --- a/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb +++ b/packages/gtkhtml/gtkhtml-3.1_3.1.16.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.1/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.1" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.1.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb index 6194529aa0..fd5fde49ed 100644 --- a/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb +++ b/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.6/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.6" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.6.pc || true diff --git a/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb b/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb index 1db83609c2..cc177de08f 100644 --- a/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb +++ b/packages/gtkhtml/gtkhtml-3.8_3.8.2.bb @@ -1,15 +1,9 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" -DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" +require gtkhtml.inc -inherit gnome +DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui" SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.8/gtkhtml-${PV}.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.8" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.8.pc || true diff --git a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb index 14e6818e7b..44a96d6d64 100644 --- a/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb +++ b/packages/gtkhtml/gtkhtml-lite-3.0_3.0.10.bb @@ -1,17 +1,11 @@ -LICENSE = "GPL" -SECTION = "x11/libs" -DESCRIPTION = "HTML rendering/editing library" +require gtkhtml.inc + DEPENDS = "gtk+ gail libgnomeprint orbit2-native" PR = "r1" -inherit gnome - SRC_URI = "http://stag.mind.be/gtkhtml-lite-3.0.10.tar.bz2" FILES_${PN} += "${datadir}/gtkhtml-3.0 ${libdir}/gtkhtml/*.so" FILES_${PN}-dev += "${libdir}/gtkhtml" -S = "${WORKDIR}/gtkhtml-${PV}" - -EXTRA_OECONF = "--disable-gtk-doc" do_stage() { mv src/libgtkhtml.pc src/libgtkhtml-3.0.pc || true diff --git a/packages/gtkhtml/gtkhtml.inc b/packages/gtkhtml/gtkhtml.inc new file mode 100644 index 0000000000..f7a346a67a --- /dev/null +++ b/packages/gtkhtml/gtkhtml.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "HTML rendering/editing library" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "GPL" + +inherit gnome + +S = "${WORKDIR}/gtkhtml-${PV}" + +EXTRA_OECONF = "--disable-gtk-doc" diff --git a/packages/gtkmm/gtkmm.inc b/packages/gtkmm/gtkmm.inc index 843274fdc5..f0c6dc093b 100644 --- a/packages/gtkmm/gtkmm.inc +++ b/packages/gtkmm/gtkmm.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gtkmm.org/" SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "glibmm" +DEPENDS = "glibmm gtk+" inherit autotools pkgconfig flow-lossage diff --git a/packages/hal/hal.inc b/packages/hal/hal.inc new file mode 100644 index 0000000000..11a6531951 --- /dev/null +++ b/packages/hal/hal.inc @@ -0,0 +1,10 @@ +DESCRIPTION = "Hardware Abstraction Layer" +HOMEPAGE = "http://freedesktop.org/Software/hal" +SECTION = "unknown" +LICENSE = "GPL LGPL AFL" + +SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" + +S = "${WORKDIR}/hal-${PV}" + +inherit autotools pkgconfig diff --git a/packages/hal/hal_0.2.98.bb b/packages/hal/hal_0.2.98.bb index 7c8b8b73eb..468a948b1a 100644 --- a/packages/hal/hal_0.2.98.bb +++ b/packages/hal/hal_0.2.98.bb @@ -1,14 +1,7 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat" RDEPENDS += "hotplug" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" - -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.2.bb b/packages/hal/hal_0.5.2.bb index fd29980e56..1ca95e8739 100644 --- a/packages/hal/hal_0.5.2.bb +++ b/packages/hal/hal_0.5.2.bb @@ -1,15 +1,8 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat" RDEPENDS += "hotplug" RRECOMMENDS = "udev-utils" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" - -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.4.bb b/packages/hal/hal_0.5.4.bb index 147439d4c3..1246637f67 100644 --- a/packages/hal/hal_0.5.4.bb +++ b/packages/hal/hal_0.5.4.bb @@ -1,18 +1,11 @@ -SECTION = "unknown" -DESCRIPTION = "Hardware Abstraction Layer" +require hal.inc + DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -HOMEPAGE = "http://freedesktop.org/Software/hal" -LICENSE = "GPL LGPL AFL" PR = "r1" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig - EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ --with-dbus-sys=${sysconfdir}/dbus-1/system.d \ diff --git a/packages/hal/hal_0.5.7.bb b/packages/hal/hal_0.5.7.bb index 5933676260..05a3ea010b 100644 --- a/packages/hal/hal_0.5.7.bb +++ b/packages/hal/hal_0.5.7.bb @@ -1,17 +1,11 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc + DEPENDS = "dbus expat libusb" RDEPENDS += "hotplug" #RDEPENDS_hal-device-manager = "python hal python-pygnome" RRECOMMENDS = "udev-utils" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://dbus-fix-api.patch;patch=1" -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://dbus-fix-api.patch;patch=1" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.8.1.bb b/packages/hal/hal_0.5.8.1.bb index f608c4018c..d0b888192c 100644 --- a/packages/hal/hal_0.5.8.1.bb +++ b/packages/hal/hal_0.5.8.1.bb @@ -1,7 +1,4 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc DEPENDS = "dbus-glib udev intltool expat libusb" RDEPENDS += "udev" @@ -10,12 +7,7 @@ RRECOMMENDS = "udev-utils" PR = "r2" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://99_hal" - -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://99_hal" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb index bb9dc82b52..79d53970f3 100644 --- a/packages/hal/hal_0.5.9.bb +++ b/packages/hal/hal_0.5.9.bb @@ -1,7 +1,4 @@ -DESCRIPTION = "Hardware Abstraction Layer" -HOMEPAGE = "http://freedesktop.org/Software/hal" -SECTION = "unknown" -LICENSE = "GPL LGPL AFL" +require hal.inc DEPENDS = "virtual/kernel dbus-glib udev intltool expat libusb" RDEPENDS += "udev hal-info" @@ -10,12 +7,7 @@ RRECOMMENDS = "udev-utils" PR = "r1" -SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://99_hal" - -S = "${WORKDIR}/hal-${PV}" - -inherit autotools pkgconfig +SRC_URI += "file://99_hal" EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ --with-expat=${STAGING_LIBDIR}/.. \ diff --git a/packages/intltool/intltool-native_0.30.bb b/packages/intltool/intltool-native_0.30.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.30.bb +++ b/packages/intltool/intltool-native_0.30.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.31.bb b/packages/intltool/intltool-native_0.31.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.31.bb +++ b/packages/intltool/intltool-native_0.31.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.34.bb b/packages/intltool/intltool-native_0.34.bb index 7cf3c4e11f..05f7efdda4 100644 --- a/packages/intltool/intltool-native_0.34.bb +++ b/packages/intltool/intltool-native_0.34.bb @@ -1,4 +1,4 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb index fdd2652e11..bac5378113 100644 --- a/packages/intltool/intltool-native_0.35.0.bb +++ b/packages/intltool/intltool-native_0.35.0.bb @@ -1,7 +1,7 @@ -SECTION = "devel" require intltool_${PV}.bb + inherit native DEPENDS = "libxml-parser-perl-native" -export PERL="/usr/bin/env perl" +export PERL = "/usr/bin/env perl" SRC_URI_append = " file://intltool-nowarn.patch;patch=1" diff --git a/packages/intltool/intltool.inc b/packages/intltool/intltool.inc new file mode 100644 index 0000000000..f4de1ff4aa --- /dev/null +++ b/packages/intltool/intltool.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Utility scripts for internationalizing XML" +PRIORITY = "optional" +SECTION = "devel" +LICENSE = "GPL" + +SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" +S = "${WORKDIR}/intltool-${PV}" + +inherit autotools pkgconfig + +do_stage() { + install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/intltool/intltool_0.30.bb b/packages/intltool/intltool_0.30.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.30.bb +++ b/packages/intltool/intltool_0.30.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.31.bb b/packages/intltool/intltool_0.31.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.31.bb +++ b/packages/intltool/intltool_0.31.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.34.bb b/packages/intltool/intltool_0.34.bb index f1660e7262..e48262574b 100644 --- a/packages/intltool/intltool_0.34.bb +++ b/packages/intltool/intltool_0.34.bb @@ -1,12 +1 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" - -SRC_URI = "${GNOME_MIRROR}/intltool/${PV}/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} +require intltool.inc diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb index de8705ccf0..6dea51a5fc 100644 --- a/packages/intltool/intltool_0.35.0.bb +++ b/packages/intltool/intltool_0.35.0.bb @@ -1,18 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" +require intltool.inc + DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" PR = "r1" RRECOMMENDS = "perl-modules" - -SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/intltool/intltool_0.35.2.bb b/packages/intltool/intltool_0.35.2.bb index daba37a9da..6626ed54fe 100644 --- a/packages/intltool/intltool_0.35.2.bb +++ b/packages/intltool/intltool_0.35.2.bb @@ -1,18 +1,8 @@ -SECTION = "devel" -DESCRIPTION = "Utility scripts for internationalizing XML" -LICENSE = "GPL" +require intltool.inc + DEPENDS = "libxml-parser-perl-native" #RDEPENDS = "libxml-parser-perl" PR = "r0" RRECOMMENDS = "perl-modules" - -SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2" -S = "${WORKDIR}/intltool-${PV}" - -inherit autotools pkgconfig - -do_stage() { - install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb index 3380a4e00c..2329fbd4d5 100644 --- a/packages/mpeg2dec/mpeg2dec_0.4.0b.bb +++ b/packages/mpeg2dec/mpeg2dec_0.4.0b.bb @@ -1,14 +1,14 @@ DESCRIPTION = "Library and test program for decoding mpeg-2 and mpeg-1 video streams" HOMEPAGE = "http://libmpeg2.sourceforge.net/" -LICENSE = "GPL" -PRIORITY = "optional" SECTION = "libs" -PR = "r2" - +PRIORITY = "optional" +LICENSE = "GPL" DEPENDS = "virtual/libsdl" +PROVIDES += "libmpeg2" +RPROVIDES += "libmpeg2" +PR = "r3" SRC_URI = "http://libmpeg2.sourceforge.net/files/mpeg2dec-${PV}.tar.gz" -S = "${WORKDIR}/mpeg2dec-0.4.0" inherit autotools pkgconfig diff --git a/packages/opie-tinykate/opie-tinykate.inc b/packages/opie-tinykate/opie-tinykate.inc index aeb2fddad8..7d700cb0dd 100644 --- a/packages/opie-tinykate/opie-tinykate.inc +++ b/packages/opie-tinykate/opie-tinykate.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libqtaux2" APPNAME = "tinykate" - +PR = "r1" S = "${WORKDIR}/tinykate" @@ -23,7 +23,7 @@ do_install() { install -m 0644 ${WORKDIR}/share/${APPNAME}/syntax/*.* ${D}${palmtopdir}/share/${APPNAME}/syntax/ } -PACKAGES = " \ +PACKAGES += " \ opie-tinykate-syntax-commondev \ opie-tinykate-syntax-documentation \ opie-tinykate-syntax-misc \ diff --git a/packages/opie-tinykate/opie-tinykate_1.2.2.bb b/packages/opie-tinykate/opie-tinykate_1.2.2.bb index e964a4886e..528848b356 100644 --- a/packages/opie-tinykate/opie-tinykate_1.2.2.bb +++ b/packages/opie-tinykate/opie-tinykate_1.2.2.bb @@ -1,7 +1,5 @@ require ${PN}.inc - - SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/tinykate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/share \ diff --git a/packages/scummvm/scummvm-qpe_0.6.1b.bb b/packages/scummvm/scummvm-qpe_0.6.1b.bb index 50d107deeb..b66d58671a 100644 --- a/packages/scummvm/scummvm-qpe_0.6.1b.bb +++ b/packages/scummvm/scummvm-qpe_0.6.1b.bb @@ -1,7 +1,8 @@ require scummvm.inc + DEPENDS = "libsdl-qpe libmad tremor libogg zlib mpeg2dec" -S="${WORKDIR}/scummvm-${PV}/" +S = "${WORKDIR}/scummvm-${PV}/" do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 24b1e5a12a..28257fab4b 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -3,7 +3,7 @@ SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://puzzle.dl.sourceforge.net/scummvm/scummvm-${PV}.tar.bz2" +SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2" inherit autotools |