Move to new override syntax

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2021-08-15 23:30:40 +02:00
parent da717fcb76
commit 3915b5bc00
14 changed files with 44 additions and 44 deletions

View File

@@ -1 +1 @@
PACKAGECONFIG_append = " graphite"
PACKAGECONFIG:append = " graphite"

View File

@@ -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"

View File

@@ -12,6 +12,6 @@ SRC_URI[sha256sum] = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53
inherit autotools pkgconfig
DEPENDS = "librevenge libwpd zlib"
RDEPENDS_${PN} = "perl"
RDEPENDS:${PN} = "perl"
BBCLASSEXTEND = "native"

View File

@@ -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"

View File

@@ -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'`
}

View File

@@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff2
inherit autotools pkgconfig
RDEPENDS_${PN} = "perl"
RDEPENDS:${PN} = "perl"
BBCLASSEXTEND = "native"

View File

@@ -23,7 +23,7 @@ EXTRA_OECONF = " \
--without-man \
"
do_configure_prepend() {
do_configure:prepend() {
touch ${S}/README
}

View File

@@ -11,6 +11,6 @@ SRC_URI[sha256sum] = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e827
inherit autotools pkgconfig
FILES_${PN} += "${datadir}/vala"
FILES:${PN} += "${datadir}/vala"
BBCLASSEXTEND = "native"

View File

@@ -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

View File

@@ -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
}

View File

@@ -31,6 +31,6 @@ do_install() {
}
FILES_SOLIBSDEV = ""
FILES_${PN} += "${libdir}/liblpsolve55.so"
FILES:${PN} += "${libdir}/liblpsolve55.so"
BBCLASSEXTEND = "native"

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"