Stabilise on all archs, remove older. Wrt bug#429112.

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

4 files changed, 36 insertions, 49 deletions

diff --git a/media-fonts/droid/ChangeLog b/media-fonts/droid/ChangeLog
index 51929013f571..142a4e66adbd 100644
--- a/media-fonts/droid/ChangeLog
+++ b/media-fonts/droid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/droid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.21 2012/05/27 13:01:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.22 2012/08/20 09:24:50 scarabeus Exp $
+
+  20 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org> -droid-113-r1.ebuild,
+  droid-113-r2.ebuild:
+  Stabilise on all archs, remove older. Wrt bug#429112.
 
 *droid-113-r2 (27 May 2012)
 
@@ -86,4 +90,3 @@
   24 Jul 2008; Ben de Groot <yngwin@gentoo.org> +metadata.xml,
   +droid-1.ebuild:
   Initial import. Ebuild by me.
-
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 1c523d826b39..b08c18e0699d 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -1,10 +1,29 @@
-AUX 59-google-droid-sans-mono.conf 345 RMD160 2fe3a7e929e70f1365841c976718af3b483c0aba SHA1 c57ff8b3a8ad14c08398172f88d1207dbcab0e9b SHA256 42da7d1ac6d7055971c8b1bb98a83e893fbed621534b04247a5f6ed89ca14d44
-AUX 59-google-droid-sans.conf 3452 RMD160 2256fd3e82c36e8cee41e797553bdd12966c5034 SHA1 6e21481c6742aaf1babf328b35c10b139049fe0e SHA256 17a857c9feabdcab4b4f316102bfb6a965d189f2e2e83b79401862eb05c92916
-AUX 59-google-droid-serif.conf 329 RMD160 e895fae61ea93c0a428d7c27e9e3b80690968c31 SHA1 09b3be269dcf529afd493614d7e3887920e40aa7 SHA256 1ca686f607be4f4d62e8232ac194875a817df58741a18db02017f803028e88c4
-DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 RMD160 db2b67b0a85fef7ad262bf3ed57701bd0a38e1aa SHA1 67a6136f5314c5e8469311701c43dd25dc06f680 SHA256 78e4d9a5adb9cf525ed9e76f9691df8506242710a13d21bf2538a96b781a7ffa
-DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 RMD160 62f7e80a1a596c2dd5ceea96360edb2477e0fe6d SHA1 88b605da43e91f7d4329e2a79324cc6f71afb5cd SHA256 75da778420bd26d10cc42cab8152d4ce5fb4b86fa34237e361a1782d4e60577b
-DIST droid-113-r1.tar.bz2 4227725 RMD160 6c65e08e519d0f68be3a4007d55ce6cd4a556647 SHA1 bae438b0b18517a765084be5c3ee914954fd03ae SHA256 fec9b33203abbc2a5f62a44086de4998dce69649bd78c873e6fd44d1b7d1656e
-EBUILD droid-113-r1.ebuild 1064 RMD160 d986fe5530365fbda67fe0bd0af807945ce44046 SHA1 f695baaa334d8c4b24d6ada12fdf5c54c7a304cc SHA256 23d84b16308a690c1014151c262c7bf0236e31066d759e53b736eb8d6132e15e
-EBUILD droid-113-r2.ebuild 1199 RMD160 fd8c9a17a2f3e9bfb19a609dbcc43e9413b7f0dd SHA1 cc95a79283a85f6efa67f0eb440685f2ee72cc86 SHA256 6ea80983eb87e3fbe30dfff350fe6649ac1db52fc573925693b24cac6ccb7deb
-MISC ChangeLog 2986 RMD160 896b2d98c453cd5701804242f70389996ea0134c SHA1 d00daea6a6fd28fa60f95739356f05e0f7bc91d9 SHA256 1dddf3cafaf41b3f048d95cae9f40274bcc97e68dbf795fc2d420c5f183e83f1
-MISC metadata.xml 248 RMD160 3bec556af8d5b06e2f27fc8f0726d57fe56c44d4 SHA1 385b3dabe6b9aace9aea26f5debd8e78a9ec6c6c SHA256 e5480a90156249d8eab58da965e1d411ea3f57d59ea5c3551b03dec43aa09f47
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 59-google-droid-sans-mono.conf 345 SHA256 42da7d1ac6d7055971c8b1bb98a83e893fbed621534b04247a5f6ed89ca14d44 SHA512 f90b13c2779b755b5c35b2c1b3b5578c846a6acf47d049169df866625e478e940662398b8b95589bacfb54cdefa1de67c8bc2220607e4041f2b515996f2d1ba1 WHIRLPOOL 728322b348d64c025734a0b51a09f5862c1ec4150616e17ff1e93cda685d3598849229e62e6e77fc54818a9e52616c0d6dedad975383a63f2012de39390406e8
+AUX 59-google-droid-sans.conf 3452 SHA256 17a857c9feabdcab4b4f316102bfb6a965d189f2e2e83b79401862eb05c92916 SHA512 f2383326f88283beffcf91e304991b70b8d573a89cb72a44c452c804a801139527742df83c6d1a81c5c325fa7320535efcc1ed212ce433f9711c58f0f01746cf WHIRLPOOL 5da5d152bbd3185609571b9c89afd7db401a9183d89c512f1458b70f11abfccfcc6ffb683c67b64a5845b43b511480e4d294a003d3069f1758f9bbfe08dd7132
+AUX 59-google-droid-serif.conf 329 SHA256 1ca686f607be4f4d62e8232ac194875a817df58741a18db02017f803028e88c4 SHA512 2990e30ffdcb32feac936e8d6d0cb6ed6c2071b551b9812c7f4f514684f8823bef4273a76c781001f970812c4056b16eb639446fa6a4027cd3a36f017a1eec48 WHIRLPOOL 0477b92ad5a3e35b3c10ac948173de8de32ec1aeb3139491fd4982426476e1e9455395bb2789726ee31b718f3db699b5992e919f1f4065208416cd7df098bdad
+DIST DroidSansMonoDotted-112_p1.ttf.bz2 74649 SHA256 78e4d9a5adb9cf525ed9e76f9691df8506242710a13d21bf2538a96b781a7ffa SHA512 420cf24d3585d1f7b8a81f81e743ec415344b365f1f80447f43e384df39b9825926efd8762bc7864c3c3363e4054b8bc8f8f78871b6a23074994a869da911fdf WHIRLPOOL 11012e772a5ae9ebaf87f8c095e600cc95e8feefe05259916f72a959e4c6b9c5e72a8aa912acf8304ec3942d5b6e854ac7aabcb4290e4886edfa7767eb7e2318
+DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 SHA256 75da778420bd26d10cc42cab8152d4ce5fb4b86fa34237e361a1782d4e60577b SHA512 bd6031600631fcd51c72232c6a2b42230274b3445b658a2299f4d87613e3a97775b08d10b4a1ad0f3758a5b927593bff0dac6ebb3768d6e44e32c047d858878c WHIRLPOOL 3644bb97585bb4f95d59da30069dfeeed5f8555c45bef2dc3d88439b2c31e8b90f98c4151fef8c9b75cf6bd3c3a1f81aa8eb2b5cf818772eb2d82c20a875d6ee
+DIST droid-113-r1.tar.bz2 4227725 SHA256 fec9b33203abbc2a5f62a44086de4998dce69649bd78c873e6fd44d1b7d1656e SHA512 1219f54bb153b26bf460d89d866236a4f4ae9010eaf0c1236a9d9633dea7808df7228c6cffcf9635fcfeaa81e5f93e8ece7b02b885a5e9baddc9f522ee07ac64 WHIRLPOOL af083ff533ecc23f573eb42f254209035b7b809d40e45b87b08167a3a9e7de6c73a33ca12a53416a34d5252343014d5fab86293234e77963c1e199ac680952fb
+EBUILD droid-113-r2.ebuild 1198 SHA256 330e9d1d7ad9cf9ffe7e741aa0d42deab526fd6ecad70241fdcf359cc1c6e87c SHA512 55f4d7c342191c1fda61f0640f0999d339eec99fe566e8cf16ef7b12fdafe543ba933a86774e7ee0bed3f49f91f6dc3418c6393d5cf134b1152e779624bc5ea3 WHIRLPOOL 8ccfd86802fdef3a0845aded49a47a2f9a3d7d488bf786b707703d28fe6723554fd338f33f2d765e778480a4ff64864008880cbe6c02e8e2caf7549e8adeb8cc
+MISC ChangeLog 3145 SHA256 c4869e7d73b331ee94d1f259a93bad194b3ffd60624d7d95219c663004b82ac9 SHA512 55f5664d95f98e8371a546b1e719b74b7f1eaf78c76f5f032da35a9816912934d5c7869e408466d108531c18893c60859c78db8275ebb7232f8e85d03cc2108e WHIRLPOOL dc921ca53804c45d85c619e8896e9435c0bc67202c8f9256f6740c0b302e2a511359f74525685fd6bdfea97f6bc139ba6b2877d5b3b228b9a46e4efe378eb8b0
+MISC metadata.xml 248 SHA256 e5480a90156249d8eab58da965e1d411ea3f57d59ea5c3551b03dec43aa09f47 SHA512 4fa902a71059464fb089657f0e6ccb53e175c7f5b5ef64b447bd8b7651348a9e66828f9ec5fd61c69f768c08822522dd959c729c91161ccc23fdc6e16d780ced WHIRLPOOL 5172b3d8bea9c702b44f5f46be8b22a55da67540105377388fc913e0ac2403ac608085f3bcc4d04a15d2e86c1539480d571c4c87c30a88fc3c5166119b1741f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQMgJsAAoJEOSiRoyO7jvoG4cQAJJLzfmmZ0SRPPgTXhEyMAkD
+qqUDZx6oQq2/yzvjsDtIttXKc2Lha7vqQbIzP5LU/bVovcRXws6mpsmiUb8vS7Mr
+0WmtJLr/gU/YYCIux7MgdtDWoDUhZYFoz48FbT/uCFytToVK17Doe7sJSEkdr5q+
+YPOpTSFCFF4nnDACsnVNu0wTHrEJNx0fcAxz1xLAlbrTDYw7B3tX+XhZFeFF7F46
+VnT56sf3jq14ocZZuefk+6FeyuL3IvJbCtng3CTW93242sOAL1v3Mq11JXn00mHI
+Xf3mpL+v6t/skIMMu4/EFTG+DkxdiookDt6OpMKC5hjBRfXeZqlDKZ9e+I9AkTU3
+Z0jRB/9xLoFz2KSDwGZuTni1D4Bv0xciySuhBeR6378uOHNc8sB28OYeb4DUNCT5
+tpCY3/Tw7dc6acWMm5Rz6eroR3PL34Ms3/E83mVsm+pwGwNBpSX0ZGTJD4XtzFiQ
+UqBdADIkkX4PHvZVdQDi3zJO778XjHBHMy4YWmXaYtq186Uc+7ZeT5V+CF8bA8fT
+eQ6Xu1LrKxfxx1cD07sBSEvSv6TD4eycxhJxeKVfoUPZK74+hEG7bxIJsW2lJLhD
+qw2OObZJKgQPt8eoZUYjO3fxvrjV6+GJL96v1bxcGY4jtQs4wvrsYC5iSBxDb3Q4
++Talm7nQRxBzEqkztYqd
+=JLbe
+-----END PGP SIGNATURE-----
diff --git a/media-fonts/droid/droid-113-r1.ebuild b/media-fonts/droid/droid-113-r1.ebuild
deleted file mode 100644
index 47477ad954d2..000000000000
--- a/media-fonts/droid/droid-113-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-113-r1.ebuild,v 1.2 2011/01/27 16:49:51 spatz Exp $
-
-EAPI="2"
-
-inherit font
-
-MY_PN="${PN/d/D}"
-
-# $PV is a build number, use fontforge to find it out. 113 was taken from:
-# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
-DESCRIPTION="Font family from Google's Android project"
-HOMEPAGE="http://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/"
-SRC_URI="mirror://gentoo/${PF}.tar.bz2
-	mirror://gentoo/${MY_PN}SansMonoSlashed-112_p1.ttf.bz2
-	mirror://gentoo/${MY_PN}SansMonoDotted-112_p1.ttf.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S="${WORKDIR}/${PN}"
-FONT_S="${S}"
-FONT_SUFFIX="ttf"
-
-src_unpack() {
-	unpack ${A}
-
-	mv "${WORKDIR}/${MY_PN}SansMonoSlashed-112_p1.ttf" \
-		"${S}/${MY_PN}SansMonoSlashed.ttf"
-	mv "${WORKDIR}/${MY_PN}SansMonoDotted-112_p1.ttf" \
-		"${S}/${MY_PN}SansMonoDotted.ttf"
-}
diff --git a/media-fonts/droid/droid-113-r2.ebuild b/media-fonts/droid/droid-113-r2.ebuild
index d14f9215954b..ff164f392973 100644
--- a/media-fonts/droid/droid-113-r2.ebuild
+++ b/media-fonts/droid/droid-113-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-113-r2.ebuild,v 1.1 2012/05/27 13:01:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-113-r2.ebuild,v 1.2 2012/08/20 09:24:50 scarabeus Exp $
 
 EAPI=4
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/${P}-r1.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 S="${WORKDIR}/${PN}"