diff options
| -rw-r--r-- | media-fonts/liberation-fonts/ChangeLog | 10 | ||||
| -rw-r--r-- | media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild | 32 | ||||
| -rw-r--r-- | media-fonts/liberation-fonts/liberation-fonts-2.00.0.ebuild (renamed from media-fonts/liberation-fonts/liberation-fonts-1.07.1.ebuild) | 24 |
3 files changed, 21 insertions, 45 deletions
diff --git a/media-fonts/liberation-fonts/ChangeLog b/media-fonts/liberation-fonts/ChangeLog index 6101d9901acb..c69d5cba9983 100644 --- a/media-fonts/liberation-fonts/ChangeLog +++ b/media-fonts/liberation-fonts/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-fonts/liberation-fonts # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.34 2012/05/31 09:52:36 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/ChangeLog,v 1.35 2012/08/17 11:04:59 scarabeus Exp $ + +*liberation-fonts-2.00.0 (17 Aug 2012) + + 17 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +liberation-fonts-2.00.0.ebuild, -liberation-fonts-1.07.0-r2.ebuild, + -liberation-fonts-1.07.1.ebuild: + Version bump to latest. Drop older. 31 May 2012; Justin Lecher <jlec@gentoo.org> liberation-fonts-1.07.2.ebuild: Keyworded for ~-linux, tested by me @@ -213,4 +220,3 @@ 05 Jun 2007; Jeff Gardner <je_fro@gentoo.org> ChangeLog: Initial import. - diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild b/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild deleted file mode 100644 index 524790b30cce..000000000000 --- a/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/liberation-fonts-1.07.0-r2.ebuild,v 1.7 2012/02/14 17:17:26 tove Exp $ - -EAPI=3 - -inherit font - -DESCRIPTION="A GPL-2 Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat" -HOMEPAGE="https://fedorahosted.org/liberation-fonts" -SRC_URI="!fontforge? ( https://fedorahosted.org/releases/l/i/${PN}/${PN}-ttf-${PV}.tar.gz ) -fontforge? ( https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.gz )" - -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -SLOT="0" -LICENSE="GPL-2-with-exceptions" -IUSE="fontforge X" - -FONT_SUFFIX="ttf" - -FONT_CONF=( "${FILESDIR}/60-liberation.conf" ) - -DEPEND="fontforge? ( media-gfx/fontforge ) - app-arch/unzip" -RDEPEND="" - -if use fontforge; then - FONT_S="${S}/${PN}-ttf-${PV}" -else - FONT_S="${WORKDIR}/${PN}-ttf-${PV}" - S="${FONT_S}" -fi diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.07.1.ebuild b/media-fonts/liberation-fonts/liberation-fonts-2.00.0.ebuild index 3b6f72e45256..a831822933f5 100644 --- a/media-fonts/liberation-fonts/liberation-fonts-1.07.1.ebuild +++ b/media-fonts/liberation-fonts/liberation-fonts-2.00.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/liberation-fonts-1.07.1.ebuild,v 1.3 2012/04/13 08:03:26 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/liberation-fonts/liberation-fonts-2.00.0.ebuild,v 1.1 2012/08/17 11:04:59 scarabeus Exp $ -EAPI=3 +EAPI=4 inherit font @@ -11,9 +11,9 @@ HOMEPAGE="https://fedorahosted.org/liberation-fonts" SRC_URI="!fontforge? ( https://fedorahosted.org/releases/l/i/${PN}/${PN}-ttf-${PV}.tar.gz ) fontforge? ( https://fedorahosted.org/releases/l/i/${PN}/${P}.tar.gz )" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" SLOT="0" -LICENSE="GPL-2-with-exceptions" +LICENSE="OFL-1.1" IUSE="fontforge X" FONT_SUFFIX="ttf" @@ -21,12 +21,14 @@ FONT_SUFFIX="ttf" FONT_CONF=( "${FILESDIR}/60-liberation.conf" ) DEPEND="fontforge? ( media-gfx/fontforge )" - RDEPEND="" -if use fontforge; then - FONT_S="${S}/${PN}-ttf-${PV}" -else - FONT_S="${WORKDIR}/${PN}-ttf-${PV}" - S="${FONT_S}" -fi +pkg_setup() { + if use fontforge; then + FONT_S="${S}/${PN}-ttf-${PV}" + else + FONT_S="${WORKDIR}/${PN}-ttf-${PV}" + S="${FONT_S}" + fi + font_pkg_setup +} |