From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- media-libs/harfbuzz/Manifest | 10 +-- media-libs/harfbuzz/harfbuzz-2.6.4.ebuild | 111 ---------------------------- media-libs/harfbuzz/harfbuzz-2.6.6.ebuild | 116 ------------------------------ media-libs/harfbuzz/harfbuzz-2.7.0.ebuild | 110 ++++++++++++++++++++++++++++ media-libs/harfbuzz/harfbuzz-2.7.1.ebuild | 104 +++++++++++++++++++++++++++ media-libs/harfbuzz/harfbuzz-9999.ebuild | 84 ++++++++++------------ 6 files changed, 255 insertions(+), 280 deletions(-) delete mode 100644 media-libs/harfbuzz/harfbuzz-2.6.4.ebuild delete mode 100644 media-libs/harfbuzz/harfbuzz-2.6.6.ebuild create mode 100644 media-libs/harfbuzz/harfbuzz-2.7.0.ebuild create mode 100644 media-libs/harfbuzz/harfbuzz-2.7.1.ebuild (limited to 'media-libs/harfbuzz') diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 6f3d76679f3a..04c58b733d3c 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,12 +1,12 @@ -DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f DIST harfbuzz-2.6.5.tar.xz 8510596 BLAKE2B e495fbba7e0cb58918afeb6beb3ebcf936be896ca606cef27dcbfb9b5f10add144f7fcaa50dec35a9f909d7e87deebadb7c9e6bbbadcbd799effd96076786cde SHA512 ae66211f9b4233c1da4b22b703ab4912f684390294c5c88113e6c927d5aeda8960da3ff607a7c7be5968d9fbb5a95b1f6933070d0aab2aa442a3ec8a112cd16f -DIST harfbuzz-2.6.6.tar.xz 8530984 BLAKE2B 59ddbffdd6d7af44a1564079e8313cd24a5811cae2de46a632ebf7ec3e76b3c600d159b8be0e52cc1a776c9975955d0e888ce69c304467b3eaef41f09b2be493 SHA512 b0b6323b893a3540e36e2358cc7e7d27c98aa14f1debe65cd8eaf817a55752ea4f22369e37e195abefd03bbc787f178d1b64f167237683ac208b9a65b0ae09c8 DIST harfbuzz-2.6.7.tar.xz 9001936 BLAKE2B bd3a195506253a1446e877c35c067cc874826fc6fdae3bc3a9bfd2b7682ce12de7e6d7fd4ebe03b8178d8b678c06aa2d71715b27236347224a68e4d98a72039e SHA512 6fdd6e0952a73e1949349aa5416ef8fb3fc351b15c95be4fe1f341b111159fe58113b73a334db2697f4e3aaef5a761bd8f1d8964514406cad40f9862768d59de DIST harfbuzz-2.6.8.tar.xz 8976516 BLAKE2B 46401ae06ec70172621d2aa354901f03173a273abdb0db909332946643e82b4286be690ac717a29304e9db121dd7f693b4ce19522de772f5d140986d6333e7ce SHA512 651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d -EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3 +DIST harfbuzz-2.7.0.tar.gz 16278518 BLAKE2B 4d4bcbcd08c90cbdb34f8aca3571bcd836d578e7eab81187d7dba8a19ae586744b5f9ac83cfb6a50302648c502a87f4aa9dccdfbf39edc70d4318d831f4a55b0 SHA512 65d5b9bd3a53be659dd7d220da220f6873f7246c2ab11205132998e4ac4245fcf51b6968e705b81cc7652db5bbacc90c8db977cf1020edf7957a626a19e055c0 +DIST harfbuzz-2.7.1.tar.gz 16603949 BLAKE2B 4c1792dfb8f2c777efb2f01dfc7e4642bda507813d21db5beee467b1368e991db0f0c3f903662da0a267e7af9a6c30bb258fa057e42d3096f9f8d23ccf4bac9e SHA512 a04864e0f5e523e9d025f066e0850afdfdf53acc9881c0284034ab4384088b118551a899ae5e77bbd821c344b97fb5e0a3d4506bbb812eb0019080be7b3f75f1 EBUILD harfbuzz-2.6.5.ebuild 3164 BLAKE2B 205fecfb2ba8f0bbcbe68bff20c0e7136589a0415270ef4f96b62941e52da1fc26a99216324eddabdccc98465fa5c466411d360387f049b1f1184c4f22043416 SHA512 988a256f1994d61e0e7e1b526617f566e6c7fe3fa05057a445995a93dcd97a3ee8859bd40e1e0fb3043f46b3ce46bddabacbf6634823e47197372079a78ec8bd -EBUILD harfbuzz-2.6.6.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540 EBUILD harfbuzz-2.6.7.ebuild 3166 BLAKE2B 46cd9589c0b7b0b44c0bd2f7e14a3c544a774facf19c9aaa74a5bb6fc8a54655505b36b9cd20009eeb305ffd89bd415031b748212bf2312c82b4dfa543d62a82 SHA512 13e0a1085100ed74c9f18ac9c9b50af99e940d49e441f55ad42010b5e4cfeabcf209170600e2c48838ac9cc4036f4762cdb5d2c8811346ffc9a06ffb8b53e294 EBUILD harfbuzz-2.6.8.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540 -EBUILD harfbuzz-9999.ebuild 3172 BLAKE2B 232619df1e95eb0caa3cb4c04697ed49b30f4a7703d71f42f23eea057537eac686217e64ec91db04b1cfa24bab37ea265d40523ddb41adf7e9da3f099073a042 SHA512 1142604a0975cd202231b58261d689bba20f4c38f13c50e81ce3d7c22f717530c8dece6c8e10824cf9c446d02096042d6caac071945115b36272aec9b2779540 +EBUILD harfbuzz-2.7.0.ebuild 2999 BLAKE2B 4cb166145447a0d178aecf826c4f7e3002a14eab99d1607231df8a8531208112e030c709c3c51232ed441bef2068da09930b8f3883c72099fa1439506a7fa049 SHA512 2f0375296833fdcda59173fd040ae79bc2d10410678a3279f22cf309b925b11594fff90aa97d4718793d52d6c1b5265cd59ebf76f6c6999d67c779cdebcf1016 +EBUILD harfbuzz-2.7.1.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618 +EBUILD harfbuzz-9999.ebuild 2676 BLAKE2B 97f707097c94ce4a506aea6a65e9a855c471e4b03d8d8507068489f1e4a4d7b9469e6675a00773d856f63f18cdea77c7a16386d23b6120fc78439a6a9399c374 SHA512 0ac9dde94fff7fff9376fe73f9fd492d904506dce73b0221ac2448b754cb39bb3923c110ae553e460c44e661994c0d58b18e345b984a1b1a4d26ad8d954e0618 MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild deleted file mode 100644 index 0efff7bc4152..000000000000 --- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils - -DESCRIPTION="An OpenType text shaping engine" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" - -if [[ ${PV} = 9999 ]] ; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git" - inherit git-r3 autotools -else - SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="Old-MIT ISC icu" -SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 - -IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype" -RESTRICT="!test? ( test )" -REQUIRED_USE="introspection? ( glib )" - -RDEPEND=" - cairo? ( x11-libs/cairo:= ) - glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) - graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.34:= ) - truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -# eautoreconf requires gobject-introspection-common -# ragel needed if regenerating *.hh files from *.rl -if [[ ${PV} = 9999 ]] ; then - DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel - " -fi - -pkg_setup() { - use test && python-any-r1_pkg_setup - if ! use debug ; then - append-cppflags -DHB_NDEBUG - fi -} - -src_prepare() { - default - - xdg_environment_reset - - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - sed -i \ - -e '/AM_V_CCLD/s/\/CXXLINK/' \ - test/api/Makefile.in || die - fi - - [[ ${PV} == 9999 ]] && eautoreconf - elibtoolize # for Solaris - - # bug 618772 - append-cxxflags -std=c++14 -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die -} diff --git a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild deleted file mode 100644 index bdc327af67b0..000000000000 --- a/media-libs/harfbuzz/harfbuzz-2.6.6.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils - -DESCRIPTION="An OpenType text shaping engine" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" - -if [[ ${PV} = 9999 ]] ; then - EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" - inherit git-r3 -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="Old-MIT ISC icu" -SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 - -IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype" -RESTRICT="!test? ( test )" -REQUIRED_USE="introspection? ( glib )" - -RDEPEND=" - cairo? ( x11-libs/cairo:= ) - glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) - graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.34:= ) - truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -# eautoreconf requires gobject-introspection-common -# ragel needed if regenerating *.hh files from *.rl -if [[ ${PV} = 9999 ]] ; then - DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel - " -fi - -pkg_setup() { - use test && python-any-r1_pkg_setup - if ! use debug ; then - append-cppflags -DHB_NDEBUG - fi -} - -src_prepare() { - default - - xdg_environment_reset - - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - sed -i \ - -e '/AM_V_CCLD/s/\/CXXLINK/' \ - test/api/Makefile.in || die - fi - - sed -i \ - -e 's:tests/macos.tests::' \ - test/shaping/data/in-house/Makefile.sources \ - test/shaping/data/in-house/Makefile.in || die # bug 726120 - - eautoreconf - elibtoolize # for Solaris - - # bug 618772 - append-cxxflags -std=c++14 -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/media-libs/harfbuzz/harfbuzz-2.7.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.0.ebuild new file mode 100644 index 000000000000..8bb87bd9b556 --- /dev/null +++ b/media-libs/harfbuzz/harfbuzz-2.7.0.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils + +DESCRIPTION="An OpenType text shaping engine" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" + +if [[ ${PV} = 9999 ]] ; then + EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="Old-MIT ISC icu" +SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 + +IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype" +RESTRICT="!test? ( test )" +REQUIRED_USE="introspection? ( glib )" + +RDEPEND=" + cairo? ( x11-libs/cairo:= ) + glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) + graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) + truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-libs/gobject-introspection-common-1.34 + test? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup + if ! use debug ; then + append-cppflags -DHB_NDEBUG + fi +} + +src_prepare() { + default + + xdg_environment_reset + + if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then + # on Darwin/Solaris we need to link with g++, like automake defaults + # to, but overridden by upstream because on Linux this is not + # necessary, bug #449126 + sed -i \ + -e 's/\/CXXLINK/' \ + src/Makefile.am || die + fi + + sed -i \ + -e 's:tests/macos.tests::' \ + test/shaping/data/in-house/Makefile.sources \ + || die # bug 726120 + + if ! use doc ; then + # Taken from shipped autogen.sh script + echo "EXTRA_DIST = " > gtk-doc.make + fi + + eautoreconf + elibtoolize # for Solaris + + # bug 618772 + append-cxxflags -std=c++14 +} + +multilib_src_configure() { + # harfbuzz-gobject only used for instrospection, bug #535852 + local myeconfargs=( + --without-coretext + --without-fontconfig #609300 + --without-uniscribe + $(multilib_native_use_enable doc gtk-doc) + $(multilib_native_use_enable doc gtk-doc-html) + $(use_enable static-libs static) + $(multilib_native_use_with cairo) + $(use_with glib) + $(use_with introspection gobject) + $(use_with graphite graphite2) + $(use_with icu) + $(multilib_native_use_enable introspection) + $(use_with truetype freetype) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + + if multilib_is_native_abi; then + ln -s "${S}"/docs/html docs/html || die + fi +} + +multilib_src_install_all() { + einstalldocs + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild new file mode 100644 index 000000000000..d8d692333627 --- /dev/null +++ b/media-libs/harfbuzz/harfbuzz-2.7.1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils + +DESCRIPTION="An OpenType text shaping engine" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" + +if [[ ${PV} = 9999 ]] ; then + EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" + inherit git-r3 +else + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="Old-MIT ISC icu" +SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 + +IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype" +RESTRICT="!test? ( test )" +REQUIRED_USE="introspection? ( glib )" + +RDEPEND=" + cairo? ( x11-libs/cairo:= ) + glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) + graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.34:= ) + truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + >=dev-libs/gobject-introspection-common-1.34 + test? ( ${PYTHON_DEPS} ) +" +BDEPEND=" + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + introspection? ( dev-util/glib-utils ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup + if ! use debug ; then + append-cppflags -DHB_NDEBUG + fi +} + +src_prepare() { + default + + xdg_environment_reset + + sed -i \ + -e 's:tests/macos.tests::' \ + test/shaping/data/in-house/Makefile.sources \ + || die # bug 726120 + + # bug 618772 + append-cxxflags -std=c++14 +} + +meson_multilib_native_feature() { + if multilib_is_native_abi && use "$1" ; then + echo "enabled" + else + echo "disabled" + fi +} + +multilib_src_configure() { + # harfbuzz-gobject only used for instrospection, bug #535852 + local emesonargs=( + -Dcairo="$(meson_multilib_native_feature cairo)" + -Dcoretext="disabled" + -Ddocs="$(meson_multilib_native_feature doc)" + -Dfontconfig="disabled" #609300 + -Dintrospection="$(meson_multilib_native_feature introspection)" + -Dstatic="$(usex static-libs true false)" + $(meson_feature glib) + $(meson_feature graphite) + $(meson_feature icu) + $(meson_feature introspection gobject) + $(meson_feature test tests) + $(meson_feature truetype freetype) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index bdc327af67b0..d8d692333627 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) -inherit autotools flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils +inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils DESCRIPTION="An OpenType text shaping engine" HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -14,14 +14,14 @@ if [[ ${PV} = 9999 ]] ; then EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git" inherit git-r3 else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" + SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 -IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype" +IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype" RESTRICT="!test? ( test )" REQUIRED_USE="introspection? ( glib )" @@ -34,20 +34,14 @@ RDEPEND=" truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND} + >=dev-libs/gobject-introspection-common-1.34 test? ( ${PYTHON_DEPS} ) " BDEPEND=" - dev-util/gtk-doc-am virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + introspection? ( dev-util/glib-utils ) " -# eautoreconf requires gobject-introspection-common -# ragel needed if regenerating *.hh files from *.rl -if [[ ${PV} = 9999 ]] ; then - DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel - " -fi pkg_setup() { use test && python-any-r1_pkg_setup @@ -61,56 +55,50 @@ src_prepare() { xdg_environment_reset - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - sed -i \ - -e '/AM_V_CCLD/s/\/CXXLINK/' \ - test/api/Makefile.in || die - fi - sed -i \ -e 's:tests/macos.tests::' \ test/shaping/data/in-house/Makefile.sources \ - test/shaping/data/in-house/Makefile.in || die # bug 726120 - - eautoreconf - elibtoolize # for Solaris + || die # bug 726120 # bug 618772 append-cxxflags -std=c++14 } +meson_multilib_native_feature() { + if multilib_is_native_abi && use "$1" ; then + echo "enabled" + else + echo "disabled" + fi +} + multilib_src_configure() { # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) + local emesonargs=( + -Dcairo="$(meson_multilib_native_feature cairo)" + -Dcoretext="disabled" + -Ddocs="$(meson_multilib_native_feature doc)" + -Dfontconfig="disabled" #609300 + -Dintrospection="$(meson_multilib_native_feature introspection)" + -Dstatic="$(usex static-libs true false)" + $(meson_feature glib) + $(meson_feature graphite) + $(meson_feature icu) + $(meson_feature introspection gobject) + $(meson_feature test tests) + $(meson_feature truetype freetype) ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" + meson_src_configure +} - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install } multilib_src_install_all() { einstalldocs - find "${ED}" -type f -name "*.la" -delete || die } -- cgit v1.2.3