Index: splashutils-1.5.4.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v retrieving revision 1.4 diff -u -B -r1.4 splashutils-1.5.4.4.ebuild --- splashutils-1.5.4.4.ebuild 28 Aug 2011 17:48:30 -0000 1.4 +++ splashutils-1.5.4.4.ebuild 1 Oct 2011 15:19:35 -0000 @@ -36,7 +36,8 @@ KEYWORDS="~amd64 ~ppc ~x86" RDEPEND="gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] - || ( =media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] @@ -75,10 +76,8 @@ epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch" if use truetype ; then - if [[ "`freetype-config --ftversion`" > "2.4.4" ]]; then - cd "${SM}" - epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" - fi + cd "${SM}" + epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch" fi cd "${S}" Index: files/splashutils-1.5.4.4-freetype-bz2.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/files/splashutils-1.5.4.4-freetype-bz2.patch,v retrieving revision 1.1 diff -u -B -r1.1 splashutils-1.5.4.4-freetype-bz2.patch --- files/splashutils-1.5.4.4-freetype-bz2.patch 23 Jul 2011 22:36:21 -0000 1.1 +++ files/splashutils-1.5.4.4-freetype-bz2.patch 1 Oct 2011 15:19:35 -0000 @@ -1,11 +1,15 @@ ---- fbtruetype/Makefile.old 2011-07-12 16:57:03.110616657 +0300 -+++ fbtruetype/Makefile 2011-07-12 16:48:31.656254788 +0300 -@@ -23,7 +23,7 @@ +=== modified file 'fbtruetype/Makefile' +--- fbtruetype/Makefile 2011-10-01 14:10:17 +0000 ++++ fbtruetype/Makefile 2011-10-01 14:15:02 +0000 +@@ -23,8 +23,8 @@ OBJECTS = fbtruetype.o messages.o console.o ttf.o luxisri.o LDFLAGS += -L$(LIBDIR) -LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a -lm -+LIBSS = $(LIBDIR)/libfreetype.a $(LIBDIR)/libz.a $(LIBDIR)/libbz2.a -lm - LIBSD = -lfreetype -lm +-LIBSD = -lfreetype -lm ++LIBSS = $(shell pkg-config freetype2 --libs --static) -lm ++LIBSD = $(shell pkg-config freetype2 --libs) -lm CFLAGS += -I/usr/include/freetype2 + COMPILE = $(CC) $(CFLAGS) +