app-misc/g15composer: Don't use freetype-config

Package-Manager: Portage-2.3.35, Repoman-2.3.9

diff --git a/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch
new file mode 100644 (file)
index 0000000..9251e13
--- /dev/null
+++ b/app-misc/g15composer/files/g15composer-3.2-freetype_pkgconfig.patch
@@ -0,0 +1,44 @@
+--- g15composer-3.2/configure.in
++++ g15composer-3.2/configure.in
+@@ -14,24 +14,24 @@
+ AC_PROG_YACC
+ 
+ # Checks for --enable args
+-AC_MSG_CHECKING(whether to enable FreeType2 support)
+-AC_ARG_ENABLE(ttf, [  --enable-ttf               enable FreeType2 support],
+-        if [[[ "$enableval" = "yes" ]]]; then
+-              AC_CHECK_LIB([g15render], [g15r_ttfLoad],
+-                      AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support])
+-                      CFLAGS="$CFLAGS `freetype-config --cflags`"
+-                      CXXFLAGS="$CXXFLAGS `freetype-config --cflags`"
+-                      FTLIB="-lfreetype"
+-                      ttf_support="yes",
+-                      AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"])
+-                      ttf_support="no"
+-              )
+-        else
+-                ttf_support="no"
+-        fi,
+-        ttf_support="no"
++AC_ARG_ENABLE(ttf, [  --enable-ttf               enable FreeType2 support],,enable_ttf="no")
++AS_IF([test "x$enable_ttf" = "xyes"], [
++      PKG_PROG_PKG_CONFIG
++      PKG_CHECK_MODULES(FREETYPE, freetype2,
++              [
++                      CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
++                      CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
++                      FTLIB="$FREETYPE_LIBS"
++              ],
++              AC_MSG_ERROR([Cannot find freetype2])
++      )
++      AC_CHECK_LIB([g15render], [g15r_ttfLoad],
++              AC_DEFINE(TTF_SUPPORT, [1], [Define to 1 to enable FreeType2 support]),
++              AC_MSG_ERROR(["libg15render does not support ttf functions. please reconfigure with --enable-ttf"])
++      )
++],
++      AC_MSG_RESULT(No Freetype is being used)
+ )
+-AC_MSG_RESULT($ttf_support)
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([g15daemon_client], [g15_send], ,AC_MSG_ERROR(["libg15daemon_client not found. please install it"]))

diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild
index 0ff4c93f649fea2700fdd44ccabbd015e4daabdb..8614765071cb8ec95e708461b8dbcb2774c75f3e 100644 (file)
--- a/app-misc/g15composer/g15composer-3.2.ebuild
+++ b/app-misc/g15composer/g15composer-3.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
+
+inherit autotools
 
 DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15"
 HOMEPAGE="https://sourceforge.net/projects/g15tools/"
@@ -15,21 +16,30 @@ IUSE="truetype examples"
 
 DEPEND="app-misc/g15daemon
        >=dev-libs/libg15render-1.2[truetype?]
+       virtual/pkgconfig
        truetype? ( media-libs/freetype )"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-3.2-freetype_pkgconfig.patch
+)
+
+src_prepare() {
+       default
+       mv configure.{in,ac} || die
+       eautoreconf
+}
+
 src_configure() {
-       econf \
-               $(use_enable truetype ttf)
+       econf $(use_enable truetype ttf)
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
+       local DOCS=( AUTHORS README ChangeLog )
+       default
 
        newinitd "${FILESDIR}/${P}.initd" ${PN}
        newconfd "${FILESDIR}/${P}.confd" ${PN}
 
-       dodoc AUTHORS README ChangeLog
-
        if use examples ; then
                exeinto "/usr/share/${PN}"
                doexe examples/*