From: Jim Ramsay Date: Fri, 30 Apr 2010 12:29:05 +0000 (+0000) Subject: freefont-ttf should have been liberation-fonts instead, bug #302176 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c0b844c6860afb124951a6d320e7cf9be019ce8c;p=gentoo.git freefont-ttf should have been liberation-fonts instead, bug #302176 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/www-plugins/adobe-flash/ChangeLog b/www-plugins/adobe-flash/ChangeLog index 605502ed10f0..78d435bf22ca 100644 --- a/www-plugins/adobe-flash/ChangeLog +++ b/www-plugins/adobe-flash/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-plugins/adobe-flash # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.19 2010/03/27 15:14:59 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/ChangeLog,v 1.20 2010/04/30 12:29:05 lack Exp $ + + 30 Apr 2010; Jim Ramsay adobe-flash-9.0.262.0.ebuild, + adobe-flash-10.0.45.2.ebuild, adobe-flash-10.0.45.2-r1.ebuild: + freefont-ttf should have been liberation-fonts instead, bug #302176 *adobe-flash-10.0.45.2-r1 (27 Mar 2010) diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest index 5268f33ea5b5..8e06afa790a6 100644 --- a/www-plugins/adobe-flash/Manifest +++ b/www-plugins/adobe-flash/Manifest @@ -4,8 +4,8 @@ DIST flash-libcompat-0.2.tar.bz2 1162317 RMD160 197841eb76faacb05aec3e003f5e06e0 DIST flash-plugin-10.0.45.2-release.i386.rpm 4121963 RMD160 67710d394ff7aaa44d35db44cd9d85fff4202c42 SHA1 2b9e1acff3af983d6f29f48014c77ed8c0ec998d SHA256 fd2a4427a0c801ce675736dcadbbaa4ff473418bb19edc7b5c1fd0f4f9a8c9b8 DIST install_flash_player_9.tar.gz 3056624 RMD160 691de4c0b2b5ea3d6f7e3e07246dc7cee80ca902 SHA1 fd6da8b2afbcaf3213c772e7afc664030a50a683 SHA256 d934e3fdd49db84c346a0d501d6519e4cafe77bdb596f5af1e92e7e3eb93dab2 DIST libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz 3731155 RMD160 9c1a269c25b88a062f2529c7943ae9f73c408c1a SHA1 88193dd555e1510ffac360e293558458e75a7118 SHA256 eeabb58a7bb71843cd99fbbb5ba77b6dce93018bfcff579f6f89327a990074d6 -EBUILD adobe-flash-10.0.45.2-r1.ebuild 5487 RMD160 19d7ec82e48f243b2e9fbc39610b9345a7793ea7 SHA1 8199f01d786dfdb94f7b91903b8748f2a55969b1 SHA256 e35819aca1f66ddab5f7af12fc89e66d378c87314ef6bfca7d8b2ac434c2e4ec -EBUILD adobe-flash-10.0.45.2.ebuild 6101 RMD160 3110bddcd1847979c128dfd9aa1bedf9a586244a SHA1 dd2f0cc13749bc06d24384011c8e719e1edfc3e0 SHA256 e1ac23c7d22d6b0337d99f1c70969a9695b87c9e33bd27f6fd50bbc7383dfac2 -EBUILD adobe-flash-9.0.262.0.ebuild 1622 RMD160 02b252b43b5bd9db27c5feb2666ae0506aa84a39 SHA1 08df88361364ee8fe8d82f7c61617d9168e0d46e SHA256 ef0402228921e6c4679cd8fdf22eeaa661e3ad406d8d41f02fa403b0d29bf972 -MISC ChangeLog 20431 RMD160 ca8c4447f296b6935b2e5d9daa32677e09a621d9 SHA1 a9c3dae3994c5a628f8d0305da9a63fe590b064b SHA256 3522b88bfd59499410d78c3a097fcb44fa97f1a2bb56e4a00e3eb6e5767f8a87 +EBUILD adobe-flash-10.0.45.2-r1.ebuild 5491 RMD160 6034d78cb9ebbd326d9421966f47f06eff617c9e SHA1 c5327c052b445239659190fef36a39e0826d46c8 SHA256 b1882bd9a79e5098b1ec8e94646b3a619138258dc1bedb1ccb81cd1d5a760e70 +EBUILD adobe-flash-10.0.45.2.ebuild 6104 RMD160 9735966ebb4a678d95eea2f5eb76f79a744d4937 SHA1 7452b4c12ff89b7f5dc1f1ce2088eb11fa5f105a SHA256 4b9c0b02f15e73611bd92be79b1862bf9e0000b4abcd683a9c9f5cfcfc26ab77 +EBUILD adobe-flash-9.0.262.0.ebuild 1626 RMD160 48ba674008e5478041c1dadfab46819eb0935416 SHA1 d41ad80b47f8a580e5b441a6f1ff0855b54d778a SHA256 8a9653b06ac03adbda4783a581ecae9a4613ad4f6fb344ab45f81047396cb4f7 +MISC ChangeLog 20641 RMD160 d807ffe86da2090c0a93098e44aaff28bc1678a6 SHA1 51d782044e404e2c56bbb313ce30b2c080ec34f8 SHA256 237f5dc564c39812ebda42c36a706c5ed6d03891429c389b381717ea89cdb2ed MISC metadata.xml 429 RMD160 f5ba3860c5498d5accc68542463c813d4f61f546 SHA1 0693a51309cedd970ee6b0fc30a92a152648d39f SHA256 a43e3365edf85a93e58673f6fa03af6a7573d3ad3f2cb1c0c77ce9134f750fb6 diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild index c85ba646cccf..3433f6d00cfa 100644 --- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild,v 1.1 2010/03/27 15:14:59 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2-r1.ebuild,v 1.2 2010/04/30 12:29:05 lack Exp $ EAPI=1 inherit nsplugins rpm multilib toolchain-funcs @@ -32,7 +32,7 @@ NATIVE_DEPS="x11-libs/gtk+:2 dev-libs/nss net-misc/curl >=sys-libs/glibc-2.4 - || ( media-fonts/freefont-ttf media-fonts/corefonts )" + || ( media-fonts/liberation-fonts media-fonts/corefonts )" EMUL_DEPS=">=app-emulation/emul-linux-x86-baselibs-20100220 app-emulation/emul-linux-x86-gtklibs diff --git a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild index 377be44c6d4f..c04058ac2402 100644 --- a/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild,v 1.3 2010/03/04 14:11:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.0.45.2.ebuild,v 1.4 2010/04/30 12:29:05 lack Exp $ EAPI=1 inherit nsplugins rpm multilib toolchain-funcs @@ -32,7 +32,7 @@ NATIVE_DEPS="x11-libs/gtk+:2 dev-libs/nss net-misc/curl >=sys-libs/glibc-2.4 - || ( media-fonts/freefont-ttf media-fonts/corefonts )" + || ( media-fonts/liberation-fonts media-fonts/corefonts )" EMUL_DEPS="app-emulation/emul-linux-x86-baselibs app-emulation/emul-linux-x86-gtklibs diff --git a/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild b/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild index ae1d5c53ccf9..1a067751bc15 100644 --- a/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild +++ b/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild,v 1.1 2010/02/12 14:09:00 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-9.0.262.0.ebuild,v 1.2 2010/04/30 12:29:05 lack Exp $ inherit nsplugins @@ -26,7 +26,7 @@ RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs =x11-libs/gtk+-2* media-libs/freetype media-libs/fontconfig ) - || ( media-fonts/freefont-ttf media-fonts/corefonts )" + || ( media-fonts/liberation-fonts media-fonts/corefonts )" pkg_setup() { # This is a binary x86 package => ABI=x86