[gentoo-commits] gentoo-x86 commit in media-fonts/terminus-font: terminus-font-4.39-r1.ebuild metadata.xml ChangeLog

[Ben de Groot (yngwin)]

yngwin      15/02/10 07:43:14

  Modified:             metadata.xml ChangeLog
  Added:                terminus-font-4.39-r1.ebuild
  Log:
  Add pcf-unicode-only useflag, enabled by default (bug #520222). Bump EAPI to 5. Alphabetize USE flags listing.
  
  (Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)

Revision  Changes    Path
1.11                 media-fonts/terminus-font/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/metadata.xml?r1=1.10&r2=1.11

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml	29 Aug 2012 06:04:00 -0000	1.10
+++ metadata.xml	10 Feb 2015 07:43:14 -0000	1.11
@@ -40,5 +40,8 @@
       Place the '~' character vertically centered on the line instead of to the
       top.
     </flag>
+	<flag name="pcf-unicode-only">
+      Remove non-unicode PCF fonts that could be problematic. See bug #520222.
+    </flag>
   </use>
 </pkgmetadata>



1.104                media-fonts/terminus-font/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/ChangeLog?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/ChangeLog?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/ChangeLog?r1=1.103&r2=1.104

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ChangeLog	8 Feb 2015 19:39:17 -0000	1.103
+++ ChangeLog	10 Feb 2015 07:43:14 -0000	1.104
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/terminus-font
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.103 2015/02/08 19:39:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.104 2015/02/10 07:43:14 yngwin Exp $
+
+*terminus-font-4.39-r1 (10 Feb 2015)
+
+  10 Feb 2015; Ben de Groot <yngwin@g.o> +terminus-font-4.39-r1.ebuild,
+  metadata.xml:
+  Add pcf-unicode-only useflag, enabled by default (bug #520222). Bump EAPI to
+  5. Alphabetize USE flags listing.
 
   08 Feb 2015; Mike Gilbert <floppym@g.o> terminus-font-4.39.ebuild:
   Install 75-yes-terminus.conf.



1.1                  media-fonts/terminus-font/terminus-font-4.39-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild?rev=1.1&content-type=text/plain

Index: terminus-font-4.39-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild,v 1.1 2015/02/10 07:43:14 yngwin Exp $

EAPI=5
inherit eutils font

DESCRIPTION="A clean fixed font for the console and X11"
HOMEPAGE="http://terminus-font.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"

LICENSE="OFL-1.1 GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
	~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
	raw-font-data ru-dv +ru-g ru-i ru-k"

DEPEND="app-arch/gzip
	dev-lang/perl
	virtual/awk
	pcf? ( x11-apps/bdftopcf )"
RDEPEND=""

FONTDIR=/usr/share/fonts/terminus
FONT_CONF=( 75-yes-terminus.conf )
DOCS="README README-BG AUTHORS CHANGES"

REQUIRED_USE="X? ( pcf )"

src_prepare() {
	# Upstream patches. Some of them are suggested to be applied by default
	# dv - de NOT like latin g, but like caps greek delta
	#      ve NOT like greek beta, but like caps latin B
	# ge - ge NOT like "mirrored" latin s, but like caps greek gamma
	# ka - small ka NOT like minimised caps latin K, but like small latin k
	use a-like-o && epatch "${S}"/alt/ao2.diff
	use center-tilde && epatch "${S}"/alt/td1.diff
	use distinct-l && epatch "${S}"/alt/ll2.diff
	use ru-i     && epatch "${S}"/alt/ij1.diff
	use ru-k     && epatch "${S}"/alt/ka2.diff
	use ru-dv    && epatch "${S}"/alt/dv1.diff
	use ru-g     && epatch "${S}"/alt/ge2.diff
	use quote    && epatch "${S}"/alt/gq2.diff
}

src_configure() {
	# selfwritten configure script without executable bit
	chmod +x ./configure || die
	./configure \
		--prefix="${EPREFIX}"/usr \
		--psfdir="${EPREFIX}"/usr/share/consolefonts \
		--acmdir="${EPREFIX}"/usr/share/consoletrans \
		--unidir="${EPREFIX}"/usr/share/consoletrans \
		--x11dir="${EPREFIX}"/${FONTDIR} || die
}

src_compile() {
	local args=(
		$(usex psf 'psf txt' '')
		$(usex raw-font-data 'raw' '')
		$(usex pcf 'pcf' '')
	)
	[[ ${#args[@]} -gt 0 ]] && emake "${args[@]}"
}

src_install() {
	local args=(
		$(usex psf 'install-psf install-uni install-acm install-ref' '')
		$(usex raw-font-data 'install.raw' '')
		$(usex pcf 'install-pcf' '')
	)
	# Set the CHECKDIR to a dummy location so we always get the same set of
	# files installed regardless of what is in / or ROOT or wherever.
	[[ ${#args[@]} -gt 0 ]] && emake DESTDIR="${D}" CHECKDIR="${D}" "${args[@]}"

	# Remove trans files that the kbd package takes care of installing.
	rm -f "${ED}"/usr/share/consoletrans/*.trans

	if use pcf-unicode-only; then
		# Only the ter-x* fonts are unicode (ISO-10646-1) based
		rm -f "${ED}"/usr/share/fonts/terminus/ter-[0-9a-wy-z]* || die
	fi

	font_src_install
}