Version bump to latest. Drop older.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

4 files changed, 44 insertions, 62 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/Manifest b/media-fonts/liberation-fonts/Manifest
index 9d585db6bf07..8879fdb62eca 100644
--- a/media-fonts/liberation-fonts/Manifest
+++ b/media-fonts/liberation-fonts/Manifest
@@ -1,23 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX 60-liberation.conf 1055 RMD160 a30ef73e7104e4774394521e279216cc27b7c532 SHA1 f43ecd690b38d2f499c2b823d106ba0a9c493b02 SHA256 6a23965767bf2eb67b3669632ee8b0eee20caccf85fb60cfab18f018bfa88d06
-DIST liberation-fonts-1.07.0.tar.gz 2914542 RMD160 f21d5207365702aac66b777c60f90e63ecfdd3e2 SHA1 21e05b203bd9a44bf1f4494507acfdf5354f24bd SHA256 a3a27e2d8820b1d68354eb44967e190cdb25e84dd260d10ac8c5c8556dc21140
-DIST liberation-fonts-1.07.1.tar.gz 2914721 RMD160 8e7dfed2f07759a6c991c2a062ff4269aa88fcf1 SHA1 baa436809d5c096276779292f3f6f098fbcfc164 SHA256 8b96e80fe3f876e6ce73794f6e5492ff8cca900970e584c38314801a02f321a8
-DIST liberation-fonts-1.07.2.tar.gz 2930454 RMD160 bbfd1e436483194c77d413656ab2f45160d3f3d7 SHA1 4db1abfdb6e41bdc9a461fc7dfecf996ff1d66e6 SHA256 58684bf513849a24e23169a253e51c19dd616a41dd92a9df77daa67396c9a1e7
-DIST liberation-fonts-ttf-1.07.0.tar.gz 1326750 RMD160 18b8a71af004b453d87c678f3c6e5cd33c3eda13 SHA1 c228c05fa6cb8a899e70514bb3764cd21df6de98 SHA256 70d6acc0de062f65af672da109aa70c9777ea902f460fe3c35f753f394d58cb2
-DIST liberation-fonts-ttf-1.07.1.tar.gz 1326668 RMD160 d4dd5ad660ba5747de8e65892583427014aebaa2 SHA1 935bf5d6748b465d2d540884af67fb5dfd59fc4a SHA256 de646f7dc38ce0941247ba694a1a8372e0b7c2d79478e1ec83b67ac8d0e92d48
-DIST liberation-fonts-ttf-1.07.2.tar.gz 1332098 RMD160 ede426cf18e3f6475bd6d0231f788477d70347cd SHA1 bf6314386793d99d4f86987ff86fd274e9a679e6 SHA256 b1bbf2df80f388ca1748a41068fafebc8efdfdee7612afb78a7a7cd31004d50f
-EBUILD liberation-fonts-1.07.0-r2.ebuild 953 RMD160 1c594c1d5ae7741abbaf65a2bf2491173e6aebb0 SHA1 ad4516690024e18fe9caf847dfde8153730a5975 SHA256 da286381cbf6db93294703b30f0d2f9eff547321a6a45b7fd349a7f6b7873636
-EBUILD liberation-fonts-1.07.1.ebuild 943 RMD160 f16e04257c71747e9848b86320be47e53b7d4e4f SHA1 81627f396fa966d5ceab49f81853923944b9e93b SHA256 a55baeb1c02de3caa8a0bca190cbd86dac87830226815102de45ca0e47a0e3fa
-EBUILD liberation-fonts-1.07.2.ebuild 995 RMD160 32aba47db820dea03bb06e3895be74777b930dbe SHA1 e3e65891e02870feb9a39d25fe4d2b7c9d80a89f SHA256 557ba068d6f0d8257f7d1ee0c82139d8d8977565b23dc0bcec1405f262bba248
-MISC ChangeLog 7435 RMD160 f3a9a46ea405ca1c48d0c5e6d160b936d89aeb85 SHA1 dc37b74d5c328d4c7e5574a555858c34600aa7a3 SHA256 bcfbe3874e7dd610de953ffde1309af4d9c899cf6ecf39761a2ef7da0a9c5362
-MISC metadata.xml 466 RMD160 4a596d73eee7776ae2fdc53fe3e9bbb1e8710c76 SHA1 080346b810e280957a719cff5f00edf6031294d5 SHA256 ca7559a2f0fdc9cc477adfdbbf73c787439bf0ebfd3c60f049a5c3596cbd5165
+AUX 60-liberation.conf 1055 SHA256 6a23965767bf2eb67b3669632ee8b0eee20caccf85fb60cfab18f018bfa88d06 SHA512 dcc8066e511db34ed007df018fd2d24a9e4020e382e0f12bba8fcedac5c8a93f917885c09919e3eb38bf73b94f59eb16fc4a894952dc9709c2b12353542cf117 WHIRLPOOL 40358cdc15c7bdbeb6618dc5881ffd9575255c8f39902d2be937110c07f545aa30440f2546a676ff77b9db70aae795353532f59732d86d2215084d473bc740a6
+DIST liberation-fonts-1.07.2.tar.gz 2930454 SHA256 58684bf513849a24e23169a253e51c19dd616a41dd92a9df77daa67396c9a1e7 SHA512 6e5152196bb3c4a9fa331b192584c523463ed3770e0c4b7380a8c8e1337b7342d5278c163078a0e99e40f1e6da833dbf711930db6fb3dd759c048402ebec1b5f WHIRLPOOL cc5716b9b55ef6edf1e3aa3a65421df81add70c0c6f671aed7195fb4afbe116ece62ad2596aaa7557cf40932e60eb1d7ef4cf5d5a8ee365ac21b63891fa9f343
+DIST liberation-fonts-2.00.0.tar.gz 4835476 SHA256 a4c5ca86da2319d66f657257c7b5b7cd56162e3bfc5396c873fb21e3f7eaf075 SHA512 6936e45fc5992ae802cf0b9867759e86d0682ff42f9ab12d16a6913f2e563de3565063f737a739a85ba71545907bceed8ed11da07a5cbc2f3fdef38f455b79f3 WHIRLPOOL 83dac63246addc1a396df33b6d5f809305cc0e5fd1d6fdcbb7b3476deab2d829f0ae545f9a031e281fe07403b2931503709d52aadc3c4b184614e85e7eb3613e
+DIST liberation-fonts-ttf-1.07.2.tar.gz 1332098 SHA256 b1bbf2df80f388ca1748a41068fafebc8efdfdee7612afb78a7a7cd31004d50f
+DIST liberation-fonts-ttf-2.00.0.tar.gz 2302736 SHA256 3b7214e7352b8e4990c71018031ecb0f40d6793f140d7a956d7345997c8c5100 SHA512 d7b801967dbbe643316241883b2f58e658f0ed55e3de6153f23c7110afb8f1f683602362c7e44a66e68c7fb5b4bdb600e4e0a6697bbaa5ec67f64891d1dcec87 WHIRLPOOL 1b7f94184036b53c6bc6ba5d2f6bad167afdf947e778c01ba1fb58af48f6dfd268156d5d69978643810f4c53506851ac0db84df588fd7a99aa2a29ab28c800c2
+EBUILD liberation-fonts-1.07.2.ebuild 995 SHA256 557ba068d6f0d8257f7d1ee0c82139d8d8977565b23dc0bcec1405f262bba248 SHA512 8be0ac1bcfaecf8b5945fe2d70920d34b9c3a54cf4675ba409ae9044a9e484fe448ba1af88411e2d76f4bc9bf8422407a80408c6729c5e67dc2420fd426ff826 WHIRLPOOL baf3aabf2073ad2000d952d2fd118766f8154b0dbe176404488bdd896ea8b5e5ec8841562b49ef5bdff580a449d3ad7af256332671e6c189d68966988f1010a6
+EBUILD liberation-fonts-2.00.0.ebuild 993 SHA256 22a18434380f08fa62cfdc7bec7dcd2b4a6d50e479b81072f162f01d849360cc SHA512 a634b9f67fe4d9c54944ddf073e4a1adb86b710bcf6c13f9eab6632014b4f822a53eaf3532c4c1a356d31eccd63a6ba82516dd8608c26b85462c04cf59118ce3 WHIRLPOOL f82eab9f3dbd809c16cd71daf16587d2f41441870f29f539d2d5057dcc5eb0fa2753fdc8d2ac16d54809daedd980aca62e5dfa8a9adfc47728832209bad4c7c4
+MISC ChangeLog 7679 SHA256 1751ef39d5f5eb81c18d4ba66b378bcff3009b08998246e2453648f87331dbeb SHA512 9fa15c95a232c5d512bd7a49e5883cf7ef96f2fe3a624c4520ec87cac6c927d7d4830f716c7437fa61db27e292af0b6d5eeaa41abbabf090a2d0cfb9703f04fb WHIRLPOOL 84560cd39f03f7f33f36b448b5f43a50b54b39f79531c3ef465f70260c1556f8bcf75ec4c3d7050878ada47cf163776998d494d778716fc36804def23591231e
+MISC metadata.xml 466 SHA256 ca7559a2f0fdc9cc477adfdbbf73c787439bf0ebfd3c60f049a5c3596cbd5165 SHA512 3352e662b3a48fd5b1a4cb6549ca04e7d1746c14617054ee9093a5831166fb4d607e14545fe933a43ca009bbd775e7cb42840abdfeb21c66df5fab3ab8138aa6 WHIRLPOOL a270f2f98ef8519dbbf7ff33fac50d6d72d1bc5ef403b2185c97f2cc13d3dba4c8eab6898692ef98bf220b80280de23934c2b17b9fcf75e1e0a9f2b1d43357fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk/HP2kACgkQgAnW8HDreRZougCbBkGenVPIt9Y9yKYTgLCCP05K
-TMoAnRvU+MhmI6SohpHjB+UhXgIkVaoI
-=vFUB
+iQIcBAEBCAAGBQJQLiVhAAoJEOSiRoyO7jvo3O0P/iFbhIGNw2JBqHBHWTgUria/
+0Jy8POn2s+XuPRxeBeckSvD7f9dQZJxxdsprdU6+NfWTJ9hpRSVP4KIX7Jr4QM2d
+EPNGM4guKZ0qsE2W1gtuSGlHTNnCck4mS3eZUsNWV6Q7Hd2lM5xULy2jkfT0D6eR
+Lda5qdLPFWxUSNuU8zhy18z2lU2R/+8eRpOopvn7mBHTrqpi4Eo5W3d6ODWFPeOd
+LwfmcO5vu6ivu/+Mn4DOnxcIWuAskt2hcFfWQxWT0lmDO5S7PRbaVl014GToma7J
+Tb3Woqj34fy8Ia6cTNFmCcNtPOZlbUwq5Jbp5+VTzLYo5RPyJtMeSL9so5LQXUjx
+sE5zWLqXZBRxL0G+9kfhgkhE5dl2omjSnq9xBBng+yX2zTEj1XxOBXUR9E2+u9cX
+bQwx6274DwuwULkmqmMhkgbG+1nadm4poTKGmolYV5jc7Fx6LZknkhx6tAm+UuMi
+L+JKtPVPTYKHGYzdkSsRHQw8zg6xBjmIXjypv7x96AfhWCpcabnrsWl3EzNPicup
+tjjRhhU2o3vb6o/UFNHihbFSAM361l0r4YDBWTGzpoUV14ZPTcEBpVrMX427UiX3
+FzPYLopStif4Y9kJHi+djslHSAsghZF8WRU/qmGs+BFaLiQN59+aUWglbg1DU/+b
+eTAQJIVAW9AlPYDNDvWF
+=S5n8
 -----END PGP SIGNATURE-----
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
+}