1.2.4 had build problems on some systems - replace with 1.2.5.

Package-Manager: portage-2.1.2_rc2-r3

3 files changed, 12 insertions, 49 deletions

diff --git a/x11-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
index a26a58266313..60e5cc8a1b19 100644
--- a/x11-libs/libXfont/Manifest
+++ b/x11-libs/libXfont/Manifest
@@ -5,7 +5,7 @@ SHA256 d84d9176d9727553435919782eb54efdc3319bcafbecfa95acde91f546c9e7fc files/1.
 DIST libXfont-1.1.0.tar.bz2 591235 RMD160 36f8180891623d362379b77eb24a18a45a1e9b2e SHA1 0f09897deed6c07c56064f9d3e5b9fad7840bb54 SHA256 30bafca0519ed511c037d2b46e062bdf5088f4741a5a66f6ec39c77640a44380
 DIST libXfont-1.2.0.tar.bz2 591129 RMD160 8faaeb2514390fe2f17534c27a5ad20e2f177ff0 SHA1 c17aa459c105a9aa57a88c8d4e2c4bee85e99d99 SHA256 130d6991971a10ba8b54f52848bcb00cbb7b4229eb839f88500972e11fecf8f0
 DIST libXfont-1.2.2.tar.bz2 597652 RMD160 dacca74fe5cd882bcd6cceac4963f8cd8b4938d6 SHA1 87493c319e1f4b79de7154dd6e2de5baadce3465 SHA256 fb2f8c2ec321b4e38a65df4eaabffa1192ed8e19408e81be20cdcfc3e98b7487
-DIST libXfont-1.2.4.tar.bz2 581263 RMD160 6fff36f1acaa59900a62e4943736f2b1cdc4426e SHA1 99703233c22570bc26988fdde07e5c6df8fd50b7 SHA256 250ccff9662f7834632436ff0caf017d7b9d8317647b60ceb47606bce7a1b54b
+DIST libXfont-1.2.5.tar.bz2 581174 RMD160 9c2c400021ce79c443c74b51917357c517f0e3df SHA1 d30d9ea313ea8cee02bcfca960d3987411e4d8a1 SHA256 f41c83e6c2c72fca3f374d1aba22896aa78ca8a5e35a06d01121bf680151ef2f
 EBUILD libXfont-1.1.0-r1.ebuild 902 RMD160 eea54a0b30b51824103ad3ae6b35991af677c80b SHA1 770a7a8b71ca0b306a1410bc9bdd763c0835a0b8 SHA256 179addae8f78f46359def09c422653d7a03ccfc64cbb00b67119f6ec050aa7dc
 MD5 9f23cdfa9b7b822e715b9aa38e04fb24 libXfont-1.1.0-r1.ebuild 902
 RMD160 eea54a0b30b51824103ad3ae6b35991af677c80b libXfont-1.1.0-r1.ebuild 902
@@ -26,14 +26,14 @@ EBUILD libXfont-1.2.2.ebuild 886 RMD160 54d5e163d07b9dccb8e2d5bd8f90b63f1745aafc
 MD5 209cb363f8750e7ed7f73eb67716dac4 libXfont-1.2.2.ebuild 886
 RMD160 54d5e163d07b9dccb8e2d5bd8f90b63f1745aafc libXfont-1.2.2.ebuild 886
 SHA256 8c529c5073bccd8ef7e745df895ce65b21eb9a010dfd6b73c0dda94b841c110d libXfont-1.2.2.ebuild 886
-EBUILD libXfont-1.2.4.ebuild 905 RMD160 cc47ed3da6058bae545387aee5975918c7179493 SHA1 5b815a774397617f01afb71dd846552a6afe3d84 SHA256 bcf4f895b3dbe1be8339ec9911e8c2afb994c905f258f41b475239bc60f85aeb
-MD5 96a8f266b7883243ac8f6603262229d5 libXfont-1.2.4.ebuild 905
-RMD160 cc47ed3da6058bae545387aee5975918c7179493 libXfont-1.2.4.ebuild 905
-SHA256 bcf4f895b3dbe1be8339ec9911e8c2afb994c905f258f41b475239bc60f85aeb libXfont-1.2.4.ebuild 905
-MISC ChangeLog 7785 RMD160 6b4efa12e5d5e1a42350c4a0efaa1fbc621d3d4f SHA1 df958f24ebcebc470610584ef2055a559aa879f5 SHA256 fc5cd84f3ae9f3d5b1734eebd8d2a4b8692e87a88a2f1369afa02f6bb032d2d8
-MD5 f1e8c2fbab9362896e99729f3748753f ChangeLog 7785
-RMD160 6b4efa12e5d5e1a42350c4a0efaa1fbc621d3d4f ChangeLog 7785
-SHA256 fc5cd84f3ae9f3d5b1734eebd8d2a4b8692e87a88a2f1369afa02f6bb032d2d8 ChangeLog 7785
+EBUILD libXfont-1.2.5.ebuild 905 RMD160 3451baafc9092abe81aec05c0bbba0363be6c6de SHA1 89e64a39c1b856e1216cbf315e6d256bef4729a4 SHA256 44a364ca712dd766bd1f37e95a040a663c9ab98acdbf9ce246a5ca71372f3efa
+MD5 7d71dbb0bd9cf94cdb2ba5e1183e6386 libXfont-1.2.5.ebuild 905
+RMD160 3451baafc9092abe81aec05c0bbba0363be6c6de libXfont-1.2.5.ebuild 905
+SHA256 44a364ca712dd766bd1f37e95a040a663c9ab98acdbf9ce246a5ca71372f3efa libXfont-1.2.5.ebuild 905
+MISC ChangeLog 7989 RMD160 383eeb6adf753c9b88a960d2595d9c9034b41f02 SHA1 3a3f53c337a2b00504c0417441bd046345e4a349 SHA256 0ab59bb9e2975652a27462ba2de9778552071f744d8e58d65a06aa32ede4446e
+MD5 182c776f915bc177916bba7ece164f13 ChangeLog 7989
+RMD160 383eeb6adf753c9b88a960d2595d9c9034b41f02 ChangeLog 7989
+SHA256 0ab59bb9e2975652a27462ba2de9778552071f744d8e58d65a06aa32ede4446e ChangeLog 7989
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -53,6 +53,6 @@ SHA256 62a426754e12d456489adfe87a89528b2807acdca6ac174e6208e35b21e33766 files/di
 MD5 8c84f32500abfd3298b1e59586273dc8 files/digest-libXfont-1.2.2 247
 RMD160 48f204bb2e1f54eb46948db9b05bf74321eb4c56 files/digest-libXfont-1.2.2 247
 SHA256 518a7a98a5bd5a481a5db86b4facd7864aa7c71674b1c8fb6eb5808d54e0a8d0 files/digest-libXfont-1.2.2 247
-MD5 38ad9eed23e0454d97600e25dcc9cac9 files/digest-libXfont-1.2.4 247
-RMD160 ad07104e39dce74c852bf3b73758493381142211 files/digest-libXfont-1.2.4 247
-SHA256 517143be5e7ebf1d91e6beffcdee5e7a9f8647daa222fc46d92e40e8dc5746bd files/digest-libXfont-1.2.4 247
+MD5 abda35669cb46c9c65210e73366c82ee files/digest-libXfont-1.2.5 247
+RMD160 5fda579c0226ef9583cf16bf78ae9d43a630e49e files/digest-libXfont-1.2.5 247
+SHA256 34409aa2b7f33c868a5dee4dd36856381345d660c35a528571e6a352b6126429 files/digest-libXfont-1.2.5 247
diff --git a/x11-libs/libXfont/files/digest-libXfont-1.2.4 b/x11-libs/libXfont/files/digest-libXfont-1.2.4
deleted file mode 100644
index b9d6bc38faab..000000000000
--- a/x11-libs/libXfont/files/digest-libXfont-1.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 22901fcb5d21f11c7ecfa86bd0dcfd85 libXfont-1.2.4.tar.bz2 581263
-RMD160 6fff36f1acaa59900a62e4943736f2b1cdc4426e libXfont-1.2.4.tar.bz2 581263
-SHA256 250ccff9662f7834632436ff0caf017d7b9d8317647b60ceb47606bce7a1b54b libXfont-1.2.4.tar.bz2 581263
diff --git a/x11-libs/libXfont/libXfont-1.2.4.ebuild b/x11-libs/libXfont/libXfont-1.2.4.ebuild
deleted file mode 100644
index f8d4bf82fcb4..000000000000
--- a/x11-libs/libXfont/libXfont-1.2.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.2.4.ebuild,v 1.1 2006/12/02 16:13:25 joshuabaergen Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular flag-o-matic
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/xtrans
-	x11-libs/libfontenc
-	x11-proto/xproto
-	x11-proto/fontsproto
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/fontcacheproto"
-
-CONFIGURE_OPTIONS="$(use_enable ipv6)
-	--with-encodingsdir=/usr/share/fonts/encodings"
-
-pkg_setup() {
-	# No such function yet
-	# x-modular_pkg_setup
-
-	# (#125465) Broken with Bdirect support
-	filter-flags -Wl,-Bdirect
-	filter-ldflags -Bdirect
-	filter-ldflags -Wl,-Bdirect
-}