Stabilize on ppc/ppc64 (bug #393767). Fix LICENCE (bug #395179). Remove old.

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

diff --git a/media-fonts/unifont/ChangeLog b/media-fonts/unifont/ChangeLog
index f7b0587eb7c99551e61807286adfc5284ee9fdc3..2b6578007b64cd1a26eb621b01503cbd0aa480c8 100644 (file)
--- a/media-fonts/unifont/ChangeLog
+++ b/media-fonts/unifont/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/unifont
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.36 2011/12/18 15:49:37 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/ChangeLog,v 1.37 2012/01/08 04:30:18 dirtyepic Exp $
+
+  08 Jan 2012; Ryan Hill <dirtyepic@gentoo.org> -unifont-1.0-r4.ebuild,
+  unifont-5.1.20080914.ebuild:
+  Stabilize on ppc/ppc64 (bug #393767). Fix LICENCE (bug #395179). Remove old.
 
   18 Dec 2011; Raúl Porcel <armin76@gentoo.org> unifont-5.1.20080914.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #393767

diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index fe5e1f625e4acb16a7efc10a15471aa39cdc33b0..be2092776c5b43b5c2132f6ba4c2604589e466b1 100644 (file)
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -3,16 +3,13 @@ Hash: SHA1
 
 AUX unifont-5.1.20080914-gentoo.patch 1936 RMD160 a7cf91e3917add8b8346ff26fb0795e704c00419 SHA1 912c19506498791dba6540554f24d01b748c7684 SHA256 106e835ad268633af137e1d5c74496c85422d138675799d842d882da5f1c330b
 DIST unifont-5.1.20080914.tar.gz 8550619 RMD160 83dfe3e29aaa7d7743d6ca53de3fdf979ada1981 SHA1 f4c8211b877f42ae03e42f9a05bca41ee267708e SHA256 4d2aafedd64c48b8703f2abd4e10a5a8087d21120707cb6171c97ff0661b0edd
-DIST unifont_1.0-4.diff.gz 5144 RMD160 26630533e681231076324fc5bdc6f43c3ade8bb5 SHA1 59af4f28eaf117b70b593522d928d5a8c022df8c SHA256 cd25b042dbd07144655a44adba76c3deeef36072a9eb0ad98f0530785cce4022
-DIST unifont_1.0.orig.tar.gz 628220 RMD160 8f1887c8f9cd5f3c91df11c256778c58309e1652 SHA1 a9af6fd2ec85553a83c47ec20ed61a29c0017c83 SHA256 3489130d3fdf03be05c8a5e5a8cafaeb293526dec78297002936147e9869e82d
-EBUILD unifont-1.0-r4.ebuild 877 RMD160 78d3d8e9accfe9692980d217d0dcd05934bbc04b SHA1 bb9705ccab66f0ca400bb1498918b977e6e806d4 SHA256 2d8a84f87a9c8ebc9784aebd369f77faf7f2acd48b0c87fce0f4fc9cbfb916a3
-EBUILD unifont-5.1.20080914.ebuild 779 RMD160 425f4a66c4e82b8b9d27dae1583e4e1397d533e2 SHA1 163e9060fcadeaca740ec35667a15917259c3a85 SHA256 87cb1dce411d9a1781106ecce967c1f1313a83ae929976018baa82e3c7e7a5d5
-MISC ChangeLog 4336 RMD160 a157a7bd4cfd89f4ef08fa9bf24d5c269a146650 SHA1 c4dc0b80ca06bcfc42ee2eb48af5bc0140add588 SHA256 fd1718da221a69c0b28c7277cfe2658fceb44d5dd442b5e83d63dbdfe209199a
+EBUILD unifont-5.1.20080914.ebuild 829 RMD160 c9f05f197cbc774eed2c9b4b27adee48977ed795 SHA1 9ae431ecb3120dd2d46c238583f42f1f22466624 SHA256 b3028e14003addf659eb0531866f400a985eebf7e72c5129f78afe8b1d2465c7
+MISC ChangeLog 4521 RMD160 f66f083fcfbc6c7fe10c3c04cd58f0019f432d26 SHA1 836c696894b94b4f346f71164f9ee0568d850e5f SHA256 68aa41b90c261312fe95e6a2d25510c782bac9f353ae4a354587d06d4629ceb8
 MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7uC5cACgkQuQc30/atMkDlfQCeJN/XA7wznFyozqskH6n4lO5l
-XY8Anji7aIO5VTKF4ov207mIEibE02Ri
-=j7H6
+iEYEARECAAYFAk8JHhQACgkQiqiDRvmkBmJB2wCgsAbHry9HpleHFjVIKR6J7IZj
+YNQAoMWUcz26nVicGPF7oaimyHHHUisN
+=UwzT
 -----END PGP SIGNATURE-----

diff --git a/media-fonts/unifont/unifont-1.0-r4.ebuild b/media-fonts/unifont/unifont-1.0-r4.ebuild
deleted file mode 100644 (file)
index 8adf603..0000000
--- a/media-fonts/unifont/unifont-1.0-r4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-1.0-r4.ebuild,v 1.6 2008/06/16 03:47:56 josejx Exp $
-
-inherit font
-
-DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
-HOMEPAGE="http://czyborra.com/"
-SRC_URI="mirror://debian/pool/main/u/unifont/${P/-/_}.orig.tar.gz
-       mirror://debian/pool/main/u/unifont/${P/-/_}-4.diff.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-
-DEPEND="x11-apps/bdftopcf"
-
-S="${WORKDIR}/${PN}-dvdeug-${PV}"
-FONT_S="${S}"
-FONT_SUFFIX="pcf.gz"
-
-# Only installs fonts
-RESTRICT="strip binchecks"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${WORKDIR}/${P/-/_}-4.diff"
-}
-
-src_compile() {
-       emake || die
-       emake -f Makefile.new || die
-       gzip -9 unifont.pcf || die
-}

diff --git a/media-fonts/unifont/unifont-5.1.20080914.ebuild b/media-fonts/unifont/unifont-5.1.20080914.ebuild
index 1b46a8b6a15f0cfb8e2a2e158a3589b52b223a8d..c914b650aea4c0d9f9a1a8dc4dbf5baabbabf6ed 100644 (file)
--- a/media-fonts/unifont/unifont-5.1.20080914.ebuild
+++ b/media-fonts/unifont/unifont-5.1.20080914.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-5.1.20080914.ebuild,v 1.6 2011/12/18 15:49:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/unifont/unifont-5.1.20080914.ebuild,v 1.7 2012/01/08 04:30:18 dirtyepic Exp $
 
 inherit eutils font toolchain-funcs
 
@@ -8,12 +8,13 @@ DESCRIPTION="GNU Unifont - a Pan-Unicode X11 bitmap iso10646 font"
 HOMEPAGE="http://unifoundry.com/"
 SRC_URI="http://unifoundry.com/pub/debian/${P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="czyborra GPL-2 GPL-3 GPL-2-with-font-exception public-domain"
 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=""
 
-DEPEND="dev-lang/perl"
+DEPEND=""
+RDEPEND=""
 
 src_unpack() {
        unpack ${A}