[gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/

[Lars Wendler]

commit:     89d832842cff9f251fd72d86d8571863a07936b5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 09:10:31 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 09:11:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d83284

media-libs/harfbuzz: Synced live ebuild

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/harfbuzz/harfbuzz-9999.ebuild | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild 
b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index bdc327af67b..8bb87bd9b55 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -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,13 @@ 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 )
 "
-# 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
@@ -68,18 +61,17 @@ src_prepare() {
                sed -i \
                        -e 's/\<LINK\>/CXXLINK/' \
                        src/Makefile.am || die
-               sed -i \
-                       -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
-                       src/Makefile.in || die
-               sed -i \
-                       -e '/AM_V_CCLD/s/\<LINK\>/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
+               || die # bug 726120
+
+       if ! use doc ; then
+               # Taken from shipped autogen.sh script
+               echo "EXTRA_DIST = " > gtk-doc.make
+       fi
 
        eautoreconf
        elibtoolize # for Solaris
@@ -94,6 +86,8 @@ multilib_src_configure() {
                --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)