media-gfx/birdfont: version bump to 2.15.5

3 files changed, 65 insertions, 33 deletions

diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
index 2d8fbd70bf65..181eb3f87353 100644
--- a/media-gfx/birdfont/Manifest
+++ b/media-gfx/birdfont/Manifest
@@ -1 +1 @@
-DIST birdfont-2.5.1.tar.xz 1394944 SHA256 114899918abd3163fdcb12c1dd88f07630dff312be535cc6828095608442af8c SHA512 9976a7297900d18181dc5f2ef1c9af274b6986f126b2a499173a02bc5bd5eebb99918e1e4a152e5e304de63f86ae156045dc4a4f1da646c3579ef86f63ff8f5e WHIRLPOOL 028c077737cb0fb23a9d86d1a840885b570d84783d79a3c7610c462f6a7bab0591227b1c6397d1ba69393901c4752cbfe14ad9edd1821d613b89847e2a593d16
+DIST birdfont-2.15.5.tar.xz 2257284 SHA256 5bee9dce0b4e0532665d123fb7acea264768cf213ac088a7eb97ec5bd6a622a6 SHA512 f272917e15a7960ae1a462a85542123cfed501986032ace692e654d4806bed75d36b258d7717761a1a864b00b18d7fb412ac5e83f8ea9805d13893e479f0716e WHIRLPOOL 6d784afd5adcd6582a0574d97ce079b128ed5016879087d089404b167a1c8e2b274588a82491c3b8eb739f74531faaf79f192c53b6022791758c0614ec3906d7
diff --git a/media-gfx/birdfont/birdfont-2.5.1.ebuild b/media-gfx/birdfont/birdfont-2.15.5.ebuild
index f596cb946448..2a6deaff4d5a 100644
--- a/media-gfx/birdfont/birdfont-2.5.1.ebuild
+++ b/media-gfx/birdfont/birdfont-2.15.5.ebuild
@@ -3,8 +3,8 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="cs de el es fr id it nb nl oc pl pt_BR pt ru sk sr sv tr uk"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PLOCALES="cs de it sv"
 
 inherit python-any-r1 vala l10n toolchain-funcs multilib eutils
 
@@ -17,14 +17,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk nls"
 
-RDEPEND="dev-libs/libgee:0.8=
+RDEPEND="dev-db/sqlite:3
+	dev-libs/libgee:0.8=
 	dev-libs/glib:2
+	media-libs/fontconfig
 	media-libs/freetype:2
+	media-libs/libxmlbird
 	x11-libs/gdk-pixbuf:2
 	gtk? (
 		net-libs/libsoup:2.4
 		net-libs/webkit-gtk:3=
 		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
 		x11-libs/gtk+:3
 		x11-libs/libnotify
 	)"
@@ -37,22 +41,16 @@ src_prepare() {
 	vala_src_prepare
 
 	epatch "${FILESDIR}"/${PN}-2.5.1-verbose.patch
-
-	# The webkit we use requires gtk 3, so fix our deps too.
-	# Upstream has already made this fix for newer versions.
-	sed -i \
-		-e '/pkg-config/s:gtk+-2.0:gtk+-3.0:' \
-		scripts/build.py || die
+	epatch "${FILESDIR}"/${PN}-2.15.5-configure-valac.patch
 
 	sed -i \
 		-e "s:pkg-config:$(tc-getPKG_CONFIG):" \
-		configure scripts/{bavala,build,linux_build}.py || die
+		configure dodo.py || die
+}
 
-	# Respect custom valac even during configure time.
-	# https://github.com/johanmattssonm/birdfont/pull/18
-	sed -i \
-		-e "s:valac:${VALAC}:" \
-		configure || die
+v() {
+	echo "$@"
+	"$@" || die
 }
 
 src_configure() {
@@ -66,33 +64,25 @@ src_configure() {
 		rm po/*.po || die
 	fi
 
-	./configure \
+	v ./configure \
 		--prefix "${EPREFIX}/usr" \
 		--gtk $(usex gtk True False) \
 		--gee gee-0.8 \
-		|| die
-
-	# Hack out gtk build when it's disabled.
-	# Upstream has already fixed this for newer versions.
-	use gtk || sed -i '/^build.birdfont_gtk/d' scripts/linux_build.py
+		--valac "${VALAC}" \
+		--cc "$(tc-getCC)" \
+		--cflags "${CFLAGS} ${CPPFLAGS}" \
+		--ldflags "${LDFLAGS}"
 }
 
 src_compile() {
-	./scripts/linux_build.py \
-		--prefix "${EPREFIX}/usr" \
-		--cc "$(tc-getCC)" \
-		--cflags "${CFLAGS} ${CPPFLAGS}" \
-		--ldflags "${LDFLAGS}" \
-		--valac "${VALAC}" \
-		|| die
+	v ./build.py
 }
 
 src_install() {
-	./install.py \
+	v ./install.py \
 		--dest "${D}" \
 		--nogzip \
 		--libdir "$(get_libdir)" \
-		--manpages-directory "/share/man/man1" \
-		|| die
-	dodoc NEWS README
+		--manpages-directory "/share/man/man1"
+	dodoc NEWS README.md
 }
diff --git a/media-gfx/birdfont/files/birdfont-2.15.5-configure-valac.patch b/media-gfx/birdfont/files/birdfont-2.15.5-configure-valac.patch
new file mode 100644
index 000000000000..f908c2bf7d6c
--- /dev/null
+++ b/media-gfx/birdfont/files/birdfont-2.15.5-configure-valac.patch
@@ -0,0 +1,42 @@
+taken from upstream
+
+From b807c200016fefa9dc5f588c1a88ce08bb61381c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 16 May 2016 14:01:52 -0400
+Subject: [PATCH] configure: respect --valac option
+
+Make sure we don't still test `valac` when the compiler has been set to
+a specific version/path.
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index b0a9277..c66d268 100755
+--- a/configure
++++ b/configure
+@@ -87,10 +87,10 @@ def has_posixvala ():
+ 		print (OKGREEN + 'Using posix profile.' + ENDC)			
+ 	return 'True'
+ 
+-def configure(gtk, libbgee):
++def configure(gtk, libbgee, valac):
+ 	global gee
+ 	
+-	if not test_program_version ('valac', 0, 16, 0):
++	if not test_program_version(valac, 0, 16, 0):
+ 		print (FAIL + 'valac is too old.' + ENDC)
+ 		exit (1)
+ 
+@@ -203,7 +203,7 @@ if not options.nonnull:
+ else:
+ 	options.nonnull = True
+ 	
+-configure(options.gtk, options.gee)
++configure(options.gtk, options.gee, options.valac)
+ 
+ configfile.write_config(options.prefix)
+ configfile.write_compile_parameters(options.prefix,
+-- 
+2.8.2
+