public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/birdfont/files/, media-gfx/birdfont/
@ 2016-05-16 19:21 Mike Frysinger
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger @ 2016-05-16 19:21 UTC (permalink / raw
  To: gentoo-commits

commit:     e633d3afccdc9ab93f9bd0880d546e583ef14bf4
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 19:20:40 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May 16 19:20:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e633d3af

media-gfx/birdfont: initial ebuild

 media-gfx/birdfont/Manifest                        |  1 +
 media-gfx/birdfont/birdfont-2.5.1.ebuild           | 98 ++++++++++++++++++++++
 .../birdfont/files/birdfont-2.5.1-verbose.patch    | 10 +++
 media-gfx/birdfont/metadata.xml                    | 11 +++
 4 files changed, 120 insertions(+)

diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
new file mode 100644
index 0000000..2d8fbd7
--- /dev/null
+++ b/media-gfx/birdfont/Manifest
@@ -0,0 +1 @@
+DIST birdfont-2.5.1.tar.xz 1394944 SHA256 114899918abd3163fdcb12c1dd88f07630dff312be535cc6828095608442af8c SHA512 9976a7297900d18181dc5f2ef1c9af274b6986f126b2a499173a02bc5bd5eebb99918e1e4a152e5e304de63f86ae156045dc4a4f1da646c3579ef86f63ff8f5e WHIRLPOOL 028c077737cb0fb23a9d86d1a840885b570d84783d79a3c7610c462f6a7bab0591227b1c6397d1ba69393901c4752cbfe14ad9edd1821d613b89847e2a593d16

diff --git a/media-gfx/birdfont/birdfont-2.5.1.ebuild b/media-gfx/birdfont/birdfont-2.5.1.ebuild
new file mode 100644
index 0000000..f596cb9
--- /dev/null
+++ b/media-gfx/birdfont/birdfont-2.5.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+
+inherit python-any-r1 vala l10n toolchain-funcs multilib eutils
+
+DESCRIPTION="free font editor which lets you create vector graphics and export TTF, EOT and SVG fonts"
+HOMEPAGE="https://birdfont.org/"
+SRC_URI="https://birdfont.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk nls"
+
+RDEPEND="dev-libs/libgee:0.8=
+	dev-libs/glib:2
+	media-libs/freetype:2
+	x11-libs/gdk-pixbuf:2
+	gtk? (
+		net-libs/libsoup:2.4
+		net-libs/webkit-gtk:3=
+		x11-libs/cairo
+		x11-libs/gtk+:3
+		x11-libs/libnotify
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	nls? ( sys-devel/gettext )"
+
+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
+
+	sed -i \
+		-e "s:pkg-config:$(tc-getPKG_CONFIG):" \
+		configure scripts/{bavala,build,linux_build}.py || die
+
+	# Respect custom valac even during configure time.
+	# https://github.com/johanmattssonm/birdfont/pull/18
+	sed -i \
+		-e "s:valac:${VALAC}:" \
+		configure || die
+}
+
+src_configure() {
+	# The build scripts glob all po files to see what's available.
+	# Delete the files for langs we don't want to support.
+	if use nls ; then
+		l10n_find_plocales_changes po "" ".po" || die
+		rm_locale() { rm "po/$1.po" || die ; }
+		l10n_for_each_disabled_locale_do rm_locale
+	else
+		rm po/*.po || die
+	fi
+
+	./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
+}
+
+src_compile() {
+	./scripts/linux_build.py \
+		--prefix "${EPREFIX}/usr" \
+		--cc "$(tc-getCC)" \
+		--cflags "${CFLAGS} ${CPPFLAGS}" \
+		--ldflags "${LDFLAGS}" \
+		--valac "${VALAC}" \
+		|| die
+}
+
+src_install() {
+	./install.py \
+		--dest "${D}" \
+		--nogzip \
+		--libdir "$(get_libdir)" \
+		--manpages-directory "/share/man/man1" \
+		|| die
+	dodoc NEWS README
+}

diff --git a/media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch b/media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch
new file mode 100644
index 0000000..b44a28d
--- /dev/null
+++ b/media-gfx/birdfont/files/birdfont-2.5.1-verbose.patch
@@ -0,0 +1,10 @@
+--- a/scripts/run.py
++++ b/scripts/run.py
+@@ -20,6 +20,7 @@ import subprocess
+ 
+ def run(cmd):
+ 	cmd = "sh -c \"" + cmd.replace ("\"", "\\\"") + "\""
++	print(cmd)
+ 	process = subprocess.Popen (cmd, shell=True)
+ 	process.communicate()[0]
+ 	if not process.returncode == 0:

diff --git a/media-gfx/birdfont/metadata.xml b/media-gfx/birdfont/metadata.xml
new file mode 100644
index 0000000..c0c7638
--- /dev/null
+++ b/media-gfx/birdfont/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>fonts@gentoo.org</email>
+</maintainer>
+<upstream>
+	<bugs-to>https://birdfont.org/bugtracker/</bugs-to>
+	<remote-id type="github">johanmattssonm/birdfont</remote-id>
+</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/birdfont/files/, media-gfx/birdfont/
@ 2017-06-02  8:43 Pacho Ramos
  0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2017-06-02  8:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2fb57c0f6f99c7523d5b3099f2db4cdbef6afd93
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 08:37:06 2017 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jun  2 08:37:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fb57c0f

media-gfx/birdfont: Drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-gfx/birdfont/Manifest                        |  1 -
 media-gfx/birdfont/birdfont-2.15.5.ebuild          | 88 ----------------------
 .../files/birdfont-2.15.5-configure-valac.patch    | 42 -----------
 3 files changed, 131 deletions(-)

diff --git a/media-gfx/birdfont/Manifest b/media-gfx/birdfont/Manifest
index 521f3b64b63..48d846ac8ad 100644
--- a/media-gfx/birdfont/Manifest
+++ b/media-gfx/birdfont/Manifest
@@ -1,2 +1 @@
-DIST birdfont-2.15.5.tar.xz 2257284 SHA256 5bee9dce0b4e0532665d123fb7acea264768cf213ac088a7eb97ec5bd6a622a6 SHA512 f272917e15a7960ae1a462a85542123cfed501986032ace692e654d4806bed75d36b258d7717761a1a864b00b18d7fb412ac5e83f8ea9805d13893e479f0716e WHIRLPOOL 6d784afd5adcd6582a0574d97ce079b128ed5016879087d089404b167a1c8e2b274588a82491c3b8eb739f74531faaf79f192c53b6022791758c0614ec3906d7
 DIST birdfont-2.18.3.tar.xz 2333612 SHA256 1ef5e4c19f6da423b30a1e33c21b53335c235a6e0a46da86e422f4ebb48bc03d SHA512 c86fff4e40ecfc571e3880cfa99f6adf518daae5476ea1b2a78bab031bc832bc5c8d58ecc928eda4922134fd3ceca312b80cbb8cf2fd35ecb8dc7656addb854e WHIRLPOOL de7d281163f6d668741439f8e452116683ce8a4e928b70a6dcfc9123768d34661c0fddea7ef91fd503ed2ba0be09815a6f666be55def880b068b60336ce5c16e

diff --git a/media-gfx/birdfont/birdfont-2.15.5.ebuild b/media-gfx/birdfont/birdfont-2.15.5.ebuild
deleted file mode 100644
index 015dc3c4612..00000000000
--- a/media-gfx/birdfont/birdfont-2.15.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PLOCALES="cs de it sv"
-
-inherit python-any-r1 vala l10n toolchain-funcs multilib eutils multiprocessing
-
-DESCRIPTION="free font editor which lets you create vector graphics and export TTF, EOT and SVG fonts"
-HOMEPAGE="https://birdfont.org/"
-SRC_URI="https://birdfont.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls"
-
-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
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/doit[${PYTHON_USEDEP}]')
-	$(vala_depend)
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-2.15.5-configure-valac.patch
-
-	sed -i \
-		-e "s:pkg-config:$(tc-getPKG_CONFIG):" \
-		configure dodo.py || die
-}
-
-v() {
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	# The build scripts glob all po files to see what's available.
-	# Delete the files for langs we don't want to support.
-	if use nls ; then
-		l10n_find_plocales_changes po "" ".po" || die
-		rm_locale() { rm "po/$1.po" || die ; }
-		l10n_for_each_disabled_locale_do rm_locale
-	else
-		rm po/*.po || die
-	fi
-
-	v ./configure \
-		--prefix "${EPREFIX}/usr" \
-		--gtk $(usex gtk True False) \
-		--gee gee-0.8 \
-		--valac "${VALAC}" \
-		--cc "$(tc-getCC)" \
-		--cflags "${CFLAGS} ${CPPFLAGS}" \
-		--ldflags "${LDFLAGS}"
-}
-
-src_compile() {
-	v doit run -n $(makeopts_jobs)
-}
-
-src_install() {
-	v ./install.py \
-		--dest "${D}" \
-		--nogzip \
-		--libdir "$(get_libdir)" \
-		--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
deleted file mode 100644
index f908c2bf7d6..00000000000
--- a/media-gfx/birdfont/files/birdfont-2.15.5-configure-valac.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
-


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-06-02  8:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-02  8:43 [gentoo-commits] repo/gentoo:master commit in: media-gfx/birdfont/files/, media-gfx/birdfont/ Pacho Ramos
  -- strict thread matches above, loose matches on Subject: below --
2016-05-16 19:21 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox