Version bump. Remove old.

Package-Manager: portage-2.1.3.19

5 files changed, 27 insertions, 32 deletions

diff --git a/media-fonts/dejavu/ChangeLog b/media-fonts/dejavu/ChangeLog
index f6383e3033c4..8b9655aac345 100644
--- a/media-fonts/dejavu/ChangeLog
+++ b/media-fonts/dejavu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/dejavu
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.99 2007/11/06 17:47:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/ChangeLog,v 1.100 2007/12/13 11:44:48 pva Exp $
+
+*dejavu-2.22 (13 Dec 2007)
+
+  13 Dec 2007; <pva@gentoo.org> -dejavu-2.19.ebuild, +dejavu-2.22.ebuild:
+  Version bump. Remove old.
 
   06 Nov 2007; Markus Rothe <corsair@gentoo.org> dejavu-2.20.ebuild:
   Stable on ppc64; bug #197728
diff --git a/media-fonts/dejavu/Manifest b/media-fonts/dejavu/Manifest
index 62fefe629d9c..d99a2e3903a3 100644
--- a/media-fonts/dejavu/Manifest
+++ b/media-fonts/dejavu/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 59-dejavu.conf 2744 RMD160 f15724522cdfff79b55e0daa8b82d24a02a320c3 SHA1 f499928bbcf015adcd5ceb8713ae9864cac446a0 SHA256 72a9605e41161c7f0e0e77f8ce02ed16eb666ec457693c58334f5e67b12468ff
 MD5 e0ac0c13921a6fe5bf203d8681ae8c9c files/59-dejavu.conf 2744
 RMD160 f15724522cdfff79b55e0daa8b82d24a02a320c3 files/59-dejavu.conf 2744
 SHA256 72a9605e41161c7f0e0e77f8ce02ed16eb666ec457693c58334f5e67b12468ff files/59-dejavu.conf 2744
+DIST dejavu-fonts-ttf-2.22.tar.bz2 4071054 RMD160 369605ccefaf0cc9f84f2000d00dd6cb0d90de26 SHA1 5b9812807bd33dfc20e99eeb4de4f8e5b93f30f8 SHA256 e7af0c21fd4ebdd471378a31d7bc579fd14b879992bf35198e3207e169948de7
 DIST dejavu-ttf-2.18.tar.bz2 3598391 RMD160 1d8ff879c1ab3070d2066a7126efd1f31f86be45 SHA1 c0ed2f9ff16e0ce92fda0402b8b158159e7f6dfd SHA256 792776053c5842c4335d3f17d9f0c789063ad34c4fc0e2ccabbdefbd84f14726
-DIST dejavu-ttf-2.19.tar.bz2 3360351 RMD160 22ed08e8cf39268a679f57b993418ab782cc5d8d SHA1 0f860e0f7bb29c8f6a478c49acbbcde87c505069 SHA256 7d39aa30a3faa2b0cc941c635aa39c0ca5a6a5466951c62609b1913c65a3bea3
 DIST dejavu-ttf-2.20.tar.bz2 3419291 RMD160 1a65c545d0d3efa527dbfed52044f4fd703ee628 SHA1 e737c60da900fd844fab2da1c8eb2eb558c30935 SHA256 261b505d398a6b89511affd2cf9c352523373097de8da0df18204674af8892e8
 DIST dejavu-ttf-2.21.tar.bz2 3568331 RMD160 c6f35bb8ec3b9949664c9ebe63bc58e5e0f693fe SHA1 5f3d3362cf4e6fc269f9d429ab9d25d095e8af48 SHA256 ee27f4d4d3675f6e25d1c37b5d87710f6292ad5dcb9992b6ea04736bb86648ae
 EBUILD dejavu-2.18-r1.ebuild 754 RMD160 8a211fb37660c75fd09c1899eae37464f1cd25b9 SHA1 1c321c874e9fd46f58e38f8737c94a59d579f616 SHA256 5dd6a9804dd82fff556e294662e5de81c808840d890d39dfc38e4809e94020eb
 MD5 42e5ca61d8ae259ede3bf5be46f6d6b3 dejavu-2.18-r1.ebuild 754
 RMD160 8a211fb37660c75fd09c1899eae37464f1cd25b9 dejavu-2.18-r1.ebuild 754
 SHA256 5dd6a9804dd82fff556e294662e5de81c808840d890d39dfc38e4809e94020eb dejavu-2.18-r1.ebuild 754
-EBUILD dejavu-2.19.ebuild 751 RMD160 060a811bc15db00f5112c342c7de82c19a5ce4d9 SHA1 bd25b1bf05b65f709e5c21ecd2d8039242adb3e8 SHA256 c8571f7025c0cfd191d07f53ea3520eff243b3de158c033336d963a45e6a49b7
-MD5 e93eeab5a7631148c981d638832e9eb1 dejavu-2.19.ebuild 751
-RMD160 060a811bc15db00f5112c342c7de82c19a5ce4d9 dejavu-2.19.ebuild 751
-SHA256 c8571f7025c0cfd191d07f53ea3520eff243b3de158c033336d963a45e6a49b7 dejavu-2.19.ebuild 751
 EBUILD dejavu-2.20.ebuild 743 RMD160 ec539d412669b8cf60cd98fca5dbccbd81306e40 SHA1 7a6d6730ad14ea34e20ae0e794da5883c3a4be63 SHA256 d40d9c577b5d131fe54f94b856ff4163c8cb44561d0c20abec4fcd94b844135f
 MD5 578846ac456e009f7c3cd1e49d9a6170 dejavu-2.20.ebuild 743
 RMD160 ec539d412669b8cf60cd98fca5dbccbd81306e40 dejavu-2.20.ebuild 743
@@ -25,10 +18,14 @@ EBUILD dejavu-2.21.ebuild 750 RMD160 b041084789c1f990183135eee9ca8e2873882fa1 SH
 MD5 eb0c59b22740e8aeaebf213d801a5dda dejavu-2.21.ebuild 750
 RMD160 b041084789c1f990183135eee9ca8e2873882fa1 dejavu-2.21.ebuild 750
 SHA256 a6df9840eab78e7ae544881bb9b73b8dbef93432df859f69a7cf5dc549d7cd56 dejavu-2.21.ebuild 750
-MISC ChangeLog 11967 RMD160 89299f48a889cfca324f80fdd1fabc7a87fc2c08 SHA1 ebe111d0b8eae3c6336ea034c099a163470adcca SHA256 8e11a741a1571beb52b8e148cf7ce4465f809eee5afce7afe17091665b692630
-MD5 b989ad5a4e89b328474e6140fb6eca70 ChangeLog 11967
-RMD160 89299f48a889cfca324f80fdd1fabc7a87fc2c08 ChangeLog 11967
-SHA256 8e11a741a1571beb52b8e148cf7ce4465f809eee5afce7afe17091665b692630 ChangeLog 11967
+EBUILD dejavu-2.22.ebuild 880 RMD160 ada6a9638496b4070eeaf09702ce9d88391521ac SHA1 8bf3196ce13d632383fd137d629b2e690336681f SHA256 8b4ddfe3f0ea13202d500945db9960ba642e38fdb023e3c465cb782e6517f735
+MD5 37ce67c4609bfb7045aebee91f7e45fc dejavu-2.22.ebuild 880
+RMD160 ada6a9638496b4070eeaf09702ce9d88391521ac dejavu-2.22.ebuild 880
+SHA256 8b4ddfe3f0ea13202d500945db9960ba642e38fdb023e3c465cb782e6517f735 dejavu-2.22.ebuild 880
+MISC ChangeLog 12095 RMD160 f9fe059e441ff23c9c51ad1c4addf133ea64a246 SHA1 dba8f702281e0ed33e0532c97d23aeb3fa307dc7 SHA256 182260d69dadb19399c20b1ccfb2689df015b92eea60314699cfe214d9f9e7d8
+MD5 9bc46a16115cf72a9382f3b1ef77355d ChangeLog 12095
+RMD160 f9fe059e441ff23c9c51ad1c4addf133ea64a246 ChangeLog 12095
+SHA256 182260d69dadb19399c20b1ccfb2689df015b92eea60314699cfe214d9f9e7d8 ChangeLog 12095
 MISC metadata.xml 667 RMD160 ee11e9c2b012997895cf7a6317471ec6dfef477a SHA1 26a8e88cc43c539c3d098df093ae38eb6538a157 SHA256 5e827b10d0e12ca43ee49421a814f68b4e2b37ab329c2510046b6d0531ed429c
 MD5 826e1f50e41f006aaffd608427fc1644 metadata.xml 667
 RMD160 ee11e9c2b012997895cf7a6317471ec6dfef477a metadata.xml 667
@@ -36,19 +33,12 @@ SHA256 5e827b10d0e12ca43ee49421a814f68b4e2b37ab329c2510046b6d0531ed429c metadata
 MD5 42da1a46e42f7e3eeb128b0c73544149 files/digest-dejavu-2.18-r1 253
 RMD160 e5d4732d69897572fa43b891c66473f81dc7afe1 files/digest-dejavu-2.18-r1 253
 SHA256 a8bcaff369b01980ccc9b059ebb9718f40381588e1320c48b0d52e8cca1b0bf3 files/digest-dejavu-2.18-r1 253
-MD5 3e828ace32e51942195ccce8092933f7 files/digest-dejavu-2.19 253
-RMD160 9c64ee587645e3ca245bdc028de46a8b632eaf0d files/digest-dejavu-2.19 253
-SHA256 19eff9d4c0f05a77a2efa10f7e46f5158e25a8a6cf9ddd5c6bd6015b0b6be6e3 files/digest-dejavu-2.19 253
 MD5 82ad4e1e59bc7688ff6e8af5aa1469c8 files/digest-dejavu-2.20 253
 RMD160 6e055d6a270144e170a1a4b7a44931be5e0fa604 files/digest-dejavu-2.20 253
 SHA256 343a64dd07c2c5b71737b4dcc56ba52bf84248e2f5492c266ad4d8f9a61a89bd files/digest-dejavu-2.20 253
 MD5 307eaf0883cfc7e8c70352f69b43fa4e files/digest-dejavu-2.21 253
 RMD160 23031dc44cb734207d7afa3d499a4326ae0ed5bf files/digest-dejavu-2.21 253
 SHA256 f8de383316839c7e5cc7e5fac2ed10425947ce7711fb3b86e02071b723863f32 files/digest-dejavu-2.21 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHXmKYp/wUKkr7RBoRAvLEAJwLZjNnWmLJWrlCXK20OvlfR41LyQCbBijy
-JGk+RYsFbH+SXBD24/dlFO8=
-=QPMk
------END PGP SIGNATURE-----
+MD5 1c1350568619111aec858cbfa94753af files/digest-dejavu-2.22 271
+RMD160 8ad098a2aae6c20bee478faea04f4a7668e165cc files/digest-dejavu-2.22 271
+SHA256 58d6f0efa210aab94918263eba0791e9a2cac3b80564409bede280c9363ece51 files/digest-dejavu-2.22 271
diff --git a/media-fonts/dejavu/dejavu-2.19.ebuild b/media-fonts/dejavu/dejavu-2.22.ebuild
index d03a291dec8f..8e77dd574b5a 100644
--- a/media-fonts/dejavu/dejavu-2.19.ebuild
+++ b/media-fonts/dejavu/dejavu-2.22.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.19.ebuild,v 1.7 2007/12/11 10:12:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/dejavu/dejavu-2.22.ebuild,v 1.1 2007/12/13 11:44:48 pva Exp $
 
 inherit font
 
-MY_P="${PN}-ttf-${PV}"
+MY_P=${PN}-fonts-ttf-${PV}
 
 DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters"
 HOMEPAGE="http://dejavu.sourceforge.net/"
@@ -12,15 +12,15 @@ LICENSE="BitstreamVera"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
 DOCS="AUTHORS BUGS NEWS README status.txt langcover.txt unicover.txt"
 FONT_SUFFIX="ttf"
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}"
+S=${WORKDIR}/${MY_P}
+FONT_S=${S}/ttf
 
 # Only installs fonts
 RESTRICT="strip binchecks"
 
-FONT_CONF="${FILESDIR}/59-dejavu.conf"
+FONT_CONF="$(eval echo "${S}"/fontconfig/{20-unhint-small-dejavu.conf,20-unhint-small-dejavu-experimental.conf,57-dejavu.conf,61-dejavu-experimental.conf})"
diff --git a/media-fonts/dejavu/files/digest-dejavu-2.19 b/media-fonts/dejavu/files/digest-dejavu-2.19
deleted file mode 100644
index 789a78912aa3..000000000000
--- a/media-fonts/dejavu/files/digest-dejavu-2.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b3b3a0bb916926a9392c3daf9e70f84 dejavu-ttf-2.19.tar.bz2 3360351
-RMD160 22ed08e8cf39268a679f57b993418ab782cc5d8d dejavu-ttf-2.19.tar.bz2 3360351
-SHA256 7d39aa30a3faa2b0cc941c635aa39c0ca5a6a5466951c62609b1913c65a3bea3 dejavu-ttf-2.19.tar.bz2 3360351
diff --git a/media-fonts/dejavu/files/digest-dejavu-2.22 b/media-fonts/dejavu/files/digest-dejavu-2.22
new file mode 100644
index 000000000000..cb95b254f81d
--- /dev/null
+++ b/media-fonts/dejavu/files/digest-dejavu-2.22
@@ -0,0 +1,3 @@
+MD5 95fcce4244a786cee3ce49debe17ef34 dejavu-fonts-ttf-2.22.tar.bz2 4071054
+RMD160 369605ccefaf0cc9f84f2000d00dd6cb0d90de26 dejavu-fonts-ttf-2.22.tar.bz2 4071054
+SHA256 e7af0c21fd4ebdd471378a31d7bc579fd14b879992bf35198e3207e169948de7 dejavu-fonts-ttf-2.22.tar.bz2 4071054