Version bump to 4.38. Stabilise 4.36 on all archs. Remove older. Resolves bug#428608.

(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)

7 files changed, 22 insertions, 224 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index fe1594d7c187..9dbe037ad8bc 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-fonts/terminus-font
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.87 2011/08/27 10:52:22 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.88 2012/08/21 12:11:49 scarabeus Exp $
+
+*terminus-font-4.38 (21 Aug 2012)
+
+  21 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> +terminus-font-4.38.ebuild,
+  -files/terminus-font-4.32-parallel-install.patch, -terminus-font-4.30.ebuild,
+  -terminus-font-4.32.ebuild, -terminus-font-4.35.ebuild, metadata.xml,
+  terminus-font-4.36.ebuild:
+  Version bump to 4.38. Stabilise 4.36 on all archs. Remove older. Resolves
+  bug#428608.
 
   27 Aug 2011; Justin Lecher <jlec@gentoo.org> terminus-font-4.36.ebuild,
   metadata.xml:
diff --git a/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch b/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch
deleted file mode 100644
index cda6fb318872..000000000000
--- a/media-fonts/terminus-font/files/terminus-font-4.32-parallel-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Makefile b/Makefile
-index eff66f7..f71b025 100644
---- a/Makefile
-+++ b/Makefile
-@@ -197,6 +197,7 @@ uninstall-psf-512:
- ref = $(psfdir)/README.terminus
- 
- install-ref: README
-+	mkdir -p $(DESTDIR)$(psfdir)
- 	sed -e"/^2\.4/,/^2\.5/p" -n README | grep -v "^2\." > $(DESTDIR)$(ref)
- 
- uninstall-ref:
diff --git a/media-fonts/terminus-font/metadata.xml b/media-fonts/terminus-font/metadata.xml
index aaa5d2ecfec9..29b73cb75d3a 100644
--- a/media-fonts/terminus-font/metadata.xml
+++ b/media-fonts/terminus-font/metadata.xml
@@ -6,9 +6,6 @@
 		<flag name="a-like-o">
 			Changes view of letter 'a' - a looks like o	(see homepage)
 		</flag>
-		<flag name="bolddiag">
-			Boldified diagonal parts of '4', 'k', 'x' and some other chars
-		</flag>
 		<flag name="distinct-l">
 			ll2 variant with more distinctive l (lowercase L)
 		</flag>
@@ -39,6 +36,5 @@
 		<flag name="ru-k">
 			Changes view of Russian letter 'k' (see homepage)
 		</flag>
-		<flag name="width">Wider versions of some font elements</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-fonts/terminus-font/terminus-font-4.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild
deleted file mode 100644
index 77d0cf5f77e0..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.30.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 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.30.ebuild,v 1.12 2011/05/06 15:38:03 jlec Exp $
-
-EAPI="3"
-
-inherit eutils font
-
-DESCRIPTION="A clean fixed font for the console and X11"
-HOMEPAGE="http://terminus-font.sourceforge.net/"
-URI="mirror://sourceforge/${PN}/files/${P}"
-SRC_URI="${URI}/${P}.tar.gz
-		ru-dv? ( ${URI}/${P}-dv1.diff.gz )
-		ru-g? ( ${URI}/${P}-ge1.diff.gz )
-		quote? ( ${URI}/${P}-gq2.diff.gz )
-		width? ( ${URI}/${P}-cm2.diff.gz )
-		bolddiag? ( ${URI}/${P}-kx3.diff.gz
-				a-like-o? ( ${URI}/${P}-kx3-ao2.diff.gz )
-				ru-i? ( ${URI}/${P}-kx3-ij1.diff.gz )
-				ru-k? ( ${URI}/${P}-kx3-ka2.diff.gz ) )
-		!bolddiag? ( a-like-o? ( ${URI}/${P}-ao2.diff.gz )
-				ru-i? ( ${URI}/${P}-ij1.diff.gz )
-				ru-k? ( ${URI}/${P}-ka2.diff.gz ) )
-			"
-LICENSE="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"
-IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag +psf raw-font-data +pcf"
-
-DEPEND="dev-lang/perl
-		sys-apps/gawk
-		app-arch/gzip
-		pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-DOCS="README README-BG"
-
-pkg_setup() {
-	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
-	# That's why configuration +pcf and -X is supported, bug #155783.
-	if use X && ! use pcf ; then
-		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
-		die "Either disable X use flag or enabled pcf."
-	fi
-
-	font_pkg_setup
-}
-
-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
-	if use bolddiag; then
-		epatch "${WORKDIR}"/${P}-kx3.diff
-		use a-like-o && epatch "${WORKDIR}"/${P}-kx3-ao2.diff
-		use ru-i && epatch "${WORKDIR}"/${P}-kx3-ij1.diff
-		use ru-k && epatch "${WORKDIR}"/${P}-kx3-ka2.diff
-	else
-		use a-like-o && epatch "${WORKDIR}"/${P}-ao2.diff
-		use ru-i && epatch "${WORKDIR}"/${P}-ij1.diff
-		use ru-k && epatch "${WORKDIR}"/${P}-ka2.diff
-	fi
-	use ru-dv && epatch "${WORKDIR}"/${P}-dv1.diff
-	use ru-g && epatch "${WORKDIR}"/${P}-ge1.diff
-	use quote && epatch "${WORKDIR}"/${P}-gq2.diff
-	use width && epatch "${WORKDIR}"/${P}-cm2.diff
-
-	epatch "${FILESDIR}"/${PN}-4.32-parallel-install.patch
-}
-
-src_configure() {
-	# selfwritten configure script
-	./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() {
-	if use psf; then emake psf txt || die; fi
-	if use raw-font-data; then emake raw || die; fi
-	if use pcf; then emake pcf || die; fi
-}
-
-src_install() {
-	if use psf; then
-		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
-	fi
-	if use raw-font-data; then
-		emake DESTDIR="${D}" install.raw || die
-	fi
-	if use pcf; then
-		emake DESTDIR="${D}" install-pcf || die
-	fi
-
-	font_src_install
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.32.ebuild b/media-fonts/terminus-font/terminus-font-4.32.ebuild
deleted file mode 100644
index dce679d54704..000000000000
--- a/media-fonts/terminus-font/terminus-font-4.32.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 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.32.ebuild,v 1.3 2011/01/22 01:32:11 dirtyepic Exp $
-
-EAPI=3
-
-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"
-IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width +psf raw-font-data +pcf"
-
-DEPEND="dev-lang/perl
-		sys-apps/gawk
-		app-arch/gzip
-		pcf? ( x11-apps/bdftopcf )"
-RDEPEND=""
-
-FONTDIR=/usr/share/fonts/terminus
-DOCS="README README-BG"
-
-pkg_setup() {
-	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
-	# That's why configuration +pcf and -X is supported, bug #155783.
-	if use X && ! use pcf ; then
-		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
-		die "Either disable X use flag or enabled pcf."
-	fi
-
-	font_pkg_setup
-}
-
-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 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/ge1.diff
-	use quote    && epatch "${S}"/alt/gq2.diff
-	use width    && epatch "${S}"/alt/cm2.diff
-
-	epatch "${FILESDIR}"/${P}-parallel-install.patch
-}
-
-src_configure() {
-	# selfwritten configure script
-	./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() {
-	if use psf; then emake psf txt || die; fi
-	if use raw-font-data; then emake raw || die; fi
-	if use pcf; then emake pcf || die; fi
-}
-
-src_install() {
-	if use psf; then
-		emake DESTDIR="${D}" install-psf install-uni install-acm install-ref || die
-	fi
-	if use raw-font-data; then
-		emake DESTDIR="${D}" install.raw || die
-	fi
-	if use pcf; then
-		emake DESTDIR="${D}" install-pcf || die
-	fi
-
-	font_src_install
-}
diff --git a/media-fonts/terminus-font/terminus-font-4.36.ebuild b/media-fonts/terminus-font/terminus-font-4.36.ebuild
index c7b8239a1c2b..7e82b991b735 100644
--- a/media-fonts/terminus-font/terminus-font-4.36.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.36.ebuild,v 1.2 2011/08/27 10:52:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.36.ebuild,v 1.3 2012/08/21 12:11:49 scarabeus Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ 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"
+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 distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf"
 
 DEPEND="dev-lang/perl
diff --git a/media-fonts/terminus-font/terminus-font-4.35.ebuild b/media-fonts/terminus-font/terminus-font-4.38.ebuild
index b9b8cd307445..5b77ba116608 100644
--- a/media-fonts/terminus-font/terminus-font-4.35.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.38.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.35.ebuild,v 1.2 2011/06/14 17:49:39 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.38.ebuild,v 1.1 2012/08/21 12:11:49 scarabeus Exp $
 
-EAPI=3
+EAPI=4
 
 inherit eutils font
 
@@ -13,7 +13,7 @@ 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 ru-dv +ru-g quote ru-i ru-k width +psf raw-font-data +pcf"
+IUSE="a-like-o distinct-l ru-dv +ru-g quote ru-i ru-k +psf raw-font-data +pcf"
 
 DEPEND="dev-lang/perl
 		sys-apps/gawk
@@ -24,16 +24,7 @@ RDEPEND=""
 FONTDIR=/usr/share/fonts/terminus
 DOCS="README README-BG AUTHORS CHANGES"
 
-pkg_setup() {
-	# Note: that pcf fonts can be loaded by freetype even if X is not installed.
-	# That's why configuration +pcf and -X is supported, bug #155783.
-	if use X && ! use pcf ; then
-		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
-		die "Either disable X use flag or enabled pcf."
-	fi
-
-	font_pkg_setup
-}
+REQUIRED_USE="X? ( pcf )"
 
 src_prepare() {
 	# Upstream patches. Some of them are suggested to be applied by default
@@ -42,18 +33,17 @@ src_prepare() {
 	# 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 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
-	use width    && epatch "${S}"/alt/cm2.diff
-
-	epatch "${FILESDIR}"/${PN}-4.32-parallel-install.patch
 }
 
 src_configure() {
-	# selfwritten configure script
+	# selfwritten configure script without executable bit
+	chmod +x ./configure || die
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--psfdir="${EPREFIX}"/usr/share/consolefonts \