3 files changed, 7 insertions, 39 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/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}"