diff --git a/appends/harfbuzz/harfbuzz_%.bbappend b/appends/harfbuzz/harfbuzz_%.bbappend index a28c470..9f8aa8e 100644 --- a/appends/harfbuzz/harfbuzz_%.bbappend +++ b/appends/harfbuzz/harfbuzz_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " graphite" +PACKAGECONFIG:append = " graphite" diff --git a/recipes-abiword/abiword/abiword_3.0.4.bb b/recipes-abiword/abiword/abiword_3.0.4.bb index a7cd7f5..0192530 100644 --- a/recipes-abiword/abiword/abiword_3.0.4.bb +++ b/recipes-abiword/abiword/abiword_3.0.4.bb @@ -18,11 +18,11 @@ DEPENDS = " \ libxslt \ redland rasqal \ " -RDEPENDS_${PN}_append_libc-glibc = " \ +RDEPENDS:${PN}:append:libc-glibc = " \ glibc-gconv-ibm850 glibc-gconv-cp1252 \ glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \ " -RCONFLICTS_${PN} = "${PN}-embedded" +RCONFLICTS:${PN} = "${PN}-embedded" SRC_URI = " \ http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ @@ -77,7 +77,7 @@ do_compile() { PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates " -FILES_${PN} += " \ +FILES:${PN} += " \ ${libdir}/lib${PN}-*.so \ ${datadir}/mime-info \ ${datadir}/icons/* \ @@ -104,31 +104,31 @@ FILES_${PN} += " \ # don't steal /usr/lib/libabiword-3.0.so from ${PN} # in this case it's needed in ${PN} -FILES_${PN}-dev = " \ +FILES:${PN}-dev = " \ ${includedir} \ ${libdir}/pkgconfig \ ${libdir}/${PN}*.la \ ${libdir}/lib${PN}*.la \ ${libdir}/${PN}-${SHRT_VER}/plugins/*.la \ " -FILES_${PN}-doc += "${datadir}/${PN}-*/readme*" +FILES:${PN}-doc += "${datadir}/${PN}-*/readme*" -FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings" -FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*" -FILES_${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart" -FILES_${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings" -FILES_${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*" -FILES_${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates" +FILES:${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings" +FILES:${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*" +FILES:${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart" +FILES:${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings" +FILES:${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*" +FILES:${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates" PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*" -python populate_packages_prepend () { +python populate_packages:prepend () { abiword_libdir = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins') do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') metapkg = "abiword-meta" - d.setVar('ALLOW_EMPTY_' + metapkg, "1") - d.setVar('FILES_' + metapkg, "") + d.setVar('ALLOW_EMPTY:' + metapkg, "1") + d.setVar('FILES:' + metapkg, "") blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ] metapkg_rdepends = [] packages = d.getVar('PACKAGES').split() @@ -136,10 +136,10 @@ python populate_packages_prepend () { if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): print("Modifying %s" % pkg) metapkg_rdepends.append(pkg) - d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) - d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package') + d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION:' + metapkg, 'abiword-plugin meta package') packages.append(metapkg) d.setVar('PACKAGES', ' '.join(packages)) } -FILES_${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" +FILES:${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt" diff --git a/recipes-filter/libwpg/libwpg_0.3.3.bb b/recipes-filter/libwpg/libwpg_0.3.3.bb index ef12fac..3acce57 100644 --- a/recipes-filter/libwpg/libwpg_0.3.3.bb +++ b/recipes-filter/libwpg/libwpg_0.3.3.bb @@ -12,6 +12,6 @@ SRC_URI[sha256sum] = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53 inherit autotools pkgconfig DEPENDS = "librevenge libwpd zlib" -RDEPENDS_${PN} = "perl" +RDEPENDS:${PN} = "perl" BBCLASSEXTEND = "native" diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index e05911d..88671ce 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -170,7 +170,7 @@ do_configure() { sed -i 's:-I${includedir}/gpgme++:-I${STAGING_INCDIR}/gpgme++:g' ${B}/config_host.mk } -do_compile_prepend() { +do_compile:prepend() { # INTROSPECTION_SCANNER is exprted but INTROSPECTION_COMPILER is not. This # caused 'Permission denied' errors. So give a little help: export INTROSPECTION_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper @@ -200,7 +200,7 @@ do_install() { } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/metainfo \ ${datadir}/mime \ @@ -208,10 +208,10 @@ FILES_${PN} += " \ PACKAGES =+ "${PN}-odk ${PN}-officekit" -FILES_${PN}-odk = "${libdir}/libreoffice/sdk" -INSANE_SKIP_${PN}-odk += "dev-so staticdev" +FILES:${PN}-odk = "${libdir}/libreoffice/sdk" +INSANE_SKIP:${PN}-odk += "dev-so staticdev" -FILES_${PN}-officekit = " \ +FILES:${PN}-officekit = " \ ${libdir}/girepository-1.0 \ ${libdir}/liblibreofficekitgtk.so \ " @@ -290,19 +290,19 @@ python lo_do_split_locales() { ln = legitimize_package_name(locale) pkg = pn + '-locale-' + ln packages.insert(0, pkg) - d.setVar('FILES_' + pkg, langfiles[locale] ) - d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln)) - d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) - d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l)) - d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) + d.setVar('FILES:' + pkg, langfiles[locale] ) + d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln)) + d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) + d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l)) + d.setVar('DESCRIPTION:' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) if locale_section: - d.setVar('SECTION_' + pkg, locale_section) + d.setVar('SECTION:' + pkg, locale_section) d.setVar('PACKAGES', ' '.join(packages)) return } -PACKAGESPLITFUNCS_prepend = "lo_do_split_locales " +PACKAGESPLITFUNCS:prepend = "lo_do_split_locales " -RDEPENDS_${PN} = "hunspell-dictionaries" +RDEPENDS:${PN} = "hunspell-dictionaries" diff --git a/recipes-support/gtkmathview/gtkmathview_0.8.0.bb b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb index 74ad6db..d664cf1 100644 --- a/recipes-support/gtkmathview/gtkmathview_0.8.0.bb +++ b/recipes-support/gtkmathview/gtkmathview_0.8.0.bb @@ -22,7 +22,7 @@ inherit features_check autotools pkgconfig REQUIRED_DISTRO_FEATURES = "x11" -do_configure_append() { +do_configure:append() { # avoid host polution inf pkg-config files sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'` } diff --git a/recipes-support/hyphen/hyphen_2.8.8.bb b/recipes-support/hyphen/hyphen_2.8.8.bb index 2e031f4..e0022a7 100644 --- a/recipes-support/hyphen/hyphen_2.8.8.bb +++ b/recipes-support/hyphen/hyphen_2.8.8.bb @@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff2 inherit autotools pkgconfig -RDEPENDS_${PN} = "perl" +RDEPENDS:${PN} = "perl" BBCLASSEXTEND = "native" diff --git a/recipes-support/libcmis/libcmis_0.5.2.bb b/recipes-support/libcmis/libcmis_0.5.2.bb index 80a9da8..bf8fc62 100644 --- a/recipes-support/libcmis/libcmis_0.5.2.bb +++ b/recipes-support/libcmis/libcmis_0.5.2.bb @@ -23,7 +23,7 @@ EXTRA_OECONF = " \ --without-man \ " -do_configure_prepend() { +do_configure:prepend() { touch ${S}/README } diff --git a/recipes-support/libexttextcat/libexttextcat_3.4.5.bb b/recipes-support/libexttextcat/libexttextcat_3.4.5.bb index cf8fbf0..08b5673 100644 --- a/recipes-support/libexttextcat/libexttextcat_3.4.5.bb +++ b/recipes-support/libexttextcat/libexttextcat_3.4.5.bb @@ -11,6 +11,6 @@ SRC_URI[sha256sum] = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e827 inherit autotools pkgconfig -FILES_${PN} += "${datadir}/vala" +FILES:${PN} += "${datadir}/vala" BBCLASSEXTEND = "native" diff --git a/recipes-support/liblangtag/liblangtag_0.6.3.bb b/recipes-support/liblangtag/liblangtag_0.6.3.bb index 21fab3a..211a10f 100644 --- a/recipes-support/liblangtag/liblangtag_0.6.3.bb +++ b/recipes-support/liblangtag/liblangtag_0.6.3.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607a inherit autotools pkgconfig gobject-introspection -do_configure_prepend() { +do_configure:prepend() { if ! grep -q ${HOST_SYS}-libtool ${S}/configure.ac; then # align to native libtool sed -i 's:libtool :${HOST_SYS}-libtool :g' ${S}/configure.ac diff --git a/recipes-support/librevenge/librevenge_0.0.4.bb b/recipes-support/librevenge/librevenge_0.0.4.bb index 9223e8f..9f2a4c8 100644 --- a/recipes-support/librevenge/librevenge_0.0.4.bb +++ b/recipes-support/librevenge/librevenge_0.0.4.bb @@ -18,6 +18,6 @@ DEPENDS = "cppunit zlib boost" BBCLASSEXTEND = "native" -do_install_append() { +do_install:append() { sed -i '/^Libs:/ s/$/ -lboost_system/' ${D}${libdir}/pkgconfig/librevenge-0.0.pc } diff --git a/recipes-support/lpsolve/lpsolve_5.5.2.5.bb b/recipes-support/lpsolve/lpsolve_5.5.2.5.bb index d313a99..1a02c9e 100644 --- a/recipes-support/lpsolve/lpsolve_5.5.2.5.bb +++ b/recipes-support/lpsolve/lpsolve_5.5.2.5.bb @@ -31,6 +31,6 @@ do_install() { } FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/liblpsolve55.so" +FILES:${PN} += "${libdir}/liblpsolve55.so" BBCLASSEXTEND = "native" diff --git a/recipes-support/mythes/mythes_1.2.4.bb b/recipes-support/mythes/mythes_1.2.4.bb index 61b177a..38a3518 100644 --- a/recipes-support/mythes/mythes_1.2.4.bb +++ b/recipes-support/mythes/mythes_1.2.4.bb @@ -14,10 +14,10 @@ inherit autotools pkgconfig DEPENDS = "hunspell" -do_configure_prepend() { +do_configure:prepend() { touch ${S}/NEWS } -RDEPENDS_${PN} = "perl" +RDEPENDS:${PN} = "perl" BBCLASSEXTEND = "native" diff --git a/recipes-support/t1lib/t1lib_5.1.2.bb b/recipes-support/t1lib/t1lib_5.1.2.bb index 03a2605..6e64bf6 100644 --- a/recipes-support/t1lib/t1lib_5.1.2.bb +++ b/recipes-support/t1lib/t1lib_5.1.2.bb @@ -27,5 +27,5 @@ TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OECONF = "--with-x --without-athena" EXTRA_OEMAKE = "without_doc" -FILES_${PN} += " ${datadir}/t1lib/t1lib.config" -FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" +FILES:${PN} += " ${datadir}/t1lib/t1lib.config" +FILES:${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf" diff --git a/recipes-support/vigra/vigra_1.10.0.bb b/recipes-support/vigra/vigra_1.10.0.bb index 47fa977..edc77f9 100644 --- a/recipes-support/vigra/vigra_1.10.0.bb +++ b/recipes-support/vigra/vigra_1.10.0.bb @@ -18,7 +18,7 @@ EXTRA_OECMAKE += " \ -DWITH_VIGRANUMPY=0 \ " -do_install_append() { +do_install:append() { # doc does not have useful content and is installed at the wrong location # so delete it rm -rf "${D}/${prefix}/doc"