Install all monotyped versions instead of using USE flags.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 26 insertions, 27 deletions

diff --git a/media-fonts/droid/ChangeLog b/media-fonts/droid/ChangeLog
index f0e25592eaaa..4afb096465ef 100644
--- a/media-fonts/droid/ChangeLog
+++ b/media-fonts/droid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-fonts/droid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.15 2010/01/07 19:54:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.16 2010/01/07 20:12:38 spatz Exp $
+
+  07 Jan 2010; Dror Levin <spatz@gentoo.org> droid-112_p1-r1.ebuild,
+  metadata.xml:
+  Install all monotyped versions instead of using USE flags.
 
 *droid-112_p1-r1 (07 Jan 2010)
 
diff --git a/media-fonts/droid/Manifest b/media-fonts/droid/Manifest
index 0a6ad0673989..f72c635ece87 100644
--- a/media-fonts/droid/Manifest
+++ b/media-fonts/droid/Manifest
@@ -8,18 +8,18 @@ DIST DroidSansMonoSlashed-112_p1.ttf.bz2 74632 RMD160 62f7e80a1a596c2dd5ceea9636
 DIST droid-112_p1.tar.gz 2789311 RMD160 264b3df31e579edf70f740c5121aefc0bc5b9f7a SHA1 4ac0164ac9cde471c39bfbf0cc9ccc517bedc56e SHA256 d92661dc57eb2a024bb3b861c88857411a730e59d26791e495f6a1ffac5d13cb
 EBUILD droid-107.ebuild 709 RMD160 fad710975bf238202128bcb2ec2d2ef07bba9459 SHA1 5131a4622d31a3d0eecc56cd4f0e6e371e8d938b SHA256 c093ad063990dabe80051ab5350dd2f0bd4f68e6fc944c6d833c177abcac7e35
 EBUILD droid-112.ebuild 737 RMD160 f4e33756924f320447a438fb8280d34cf1c07aa4 SHA1 4719d2ed933aa3ccdc3ab6cfea35b3f93b7df44e SHA256 c48da633f0ea64f1eb5087bcbabd5d43656abacfd0e9a48e759512f171621714
-EBUILD droid-112_p1-r1.ebuild 1143 RMD160 8b83d43fcfee70fcbb24d6de33aae1ffe6431fc5 SHA1 0d96bfb07be99e4e12b8852ad8d335ef28012337 SHA256 2007951110939251e2c595a2fcdaebabe30a66fcfd5c23b281ee4903e36b2154
+EBUILD droid-112_p1-r1.ebuild 1063 RMD160 50c5085a90163e2f1ef4449d5f021693f07643d6 SHA1 09acb658a9bff4bd5658da95a0c6d66c39359572 SHA256 de2c86eb81aee8c54c8fa48bc0fdb702926746a6753a931bf9996b6842f697fb
 EBUILD droid-112_p1.ebuild 710 RMD160 c1386a5efa505e769adc06b2fa806ac572fb65b6 SHA1 f1a70fdd512d29afadd96dea35f839c962a4a9a2 SHA256 547b6fac977726d67aa7937fb11c0986202c2fdfff988405967cc53bd24a60a4
-MISC ChangeLog 1945 RMD160 1af7efcd82878329adfd51be8d63611e3ce2e045 SHA1 fad45e9143cff4018ae6b7021242de9536e4b7da SHA256 420bb337cb522548de5261f6d174b083dc662609fe1819e72217307fa311d203
-MISC metadata.xml 447 RMD160 5b4e5d4ca5eaa6e789c99b9558c6f25e18344510 SHA1 f778e760b3b9beaa476ff2c932b76708140157d0 SHA256 1875af21e0579c8776e7c03a745f827739a88639b6aff266048df614393fee9b
+MISC ChangeLog 2092 RMD160 897bd6990d9499575499831359bdd87c72d0b7ad SHA1 169e7dbcbed1a190cc9c30a8581e57bd3221447f SHA256 f58e65a326ca2e9f299ab73daa7411869c5771b91040be498b7bd79f8e80b356
+MISC metadata.xml 258 RMD160 56993ba47b0a06ed2b7cf8f3bebcd639f507dc66 SHA1 1f515f4a607ea69c4af50793b2ea83f768764682 SHA256 f7aace84e4a857b47bf6d83506456d877bc6c60f719634b224c2a3e7b5e3de9c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLRjvxAAoJEAWF714uGAc6BQUH/24fhOr0Kw1DKCfWy61a4VCc
-vVC+RNsp2PrDVlVvqHDc9/YaG7vi6WROlyFTVHqrCoi2ecQNNjeR3WY9ghgQImWc
-01lNSM1cjGP+Pg/fWgt1nWQ74NTqLAKHE/j0/H7Znduz4yKQgoBwp4o91gPXd5BE
-MuT0VD+gKrd1FvgHpIZOuhgfIVIqo2TK6Fv0Hyc0HVHAli6mxlJGcZSYYkUccB8f
-Ifj5/Ofv0yhH4V1lVbWRM1WHFrpQzUtYEzQ/cZRgK7p+d2zghMn+SeI0Pq3mO+Qe
-CTBRx8VICFnWeZAMeyB15zvJi/RETWY6VK8PIN18+myq8WoVa9o5KZl4s1KOH4A=
-=rEyb
+iQEcBAEBCgAGBQJLRkBCAAoJEAWF714uGAc6dvwH/iD1ztOW/V1zDGcjndVSp6CX
+A3FGg+ic6X4Cp+rwsrmMpdQmD3qLkURwzfMLnOzkB3DCVAzMVBEoGw/hHpar9Y9u
+OmhEZOxuydrjgIJJtChFhrkfWF41OHy+r5Mwow02aj31Fveee9sj6aDHr6Cm6hB4
+o4VJMrbrhB9bWmOygEn8PwTBqIDcHtr87KPgPEouHRsEoGmN9DrnGb7kaKC9Sye2
+E9WxCZYiziluoYzhgnPBzzsgIzZkKSXbzvS7OvPVztyuPzJZRiLR3aVImvfdmcNA
+brBglnuCYhMJ6o/4i7Ep4c1ho7OkfHdi6hbPUye9qGahVuTa0xjdU0x1wjL0eWY=
+=qhrI
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/droid/droid-112_p1-r1.ebuild b/media-fonts/droid/droid-112_p1-r1.ebuild
index 66943069c2c4..d9ad2b7d35ba 100644
--- a/media-fonts/droid/droid-112_p1-r1.ebuild
+++ b/media-fonts/droid/droid-112_p1-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/media-fonts/droid/droid-112_p1-r1.ebuild,v 1.1 2010/01/07 19:54:16 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-112_p1-r1.ebuild,v 1.2 2010/01/07 20:12:38 spatz Exp $
 
 EAPI="2"
 
@@ -13,13 +13,13 @@ MY_PN="${PN/d/D}"
 DESCRIPTION="Font family from Google's Android project"
 HOMEPAGE="http://code.google.com/android/RELEASENOTES.html"
 SRC_URI="mirror://gentoo/${P}.tar.gz
-	slashed? ( mirror://gentoo/${MY_PN}SansMonoSlashed-${PV}.ttf.bz2 )
-	!slashed? ( dotted? ( mirror://gentoo/${MY_PN}SansMonoDotted-${PV}.ttf.bz2 ) )"
+	mirror://gentoo/${MY_PN}SansMonoSlashed-${PV}.ttf.bz2
+	mirror://gentoo/${MY_PN}SansMonoDotted-${PV}.ttf.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dotted slashed"
+IUSE=""
 
 S=${WORKDIR}/${PN}
 FONT_S=${WORKDIR}/${PN}
@@ -28,12 +28,11 @@ FONT_SUFFIX="ttf"
 RDEPEND=""
 DEPEND=""
 
-src_prepare() {
-	if use slashed; then
-		mv "${WORKDIR}/${MY_PN}SansMonoSlashed-${PV}.ttf" \
-			"${S}/${MY_PN}SansMono.ttf"
-	elif use dotted; then
-		mv "${WORKDIR}/${MY_PN}SansMonoDotted-${PV}.ttf" \
-			"${S}/${MY_PN}SansMono.ttf"
-	fi
+src_unpack() {
+	unpack ${A}
+
+	mv "${WORKDIR}/${MY_PN}SansMonoSlashed-${PV}.ttf" \
+		"${S}/${MY_PN}SansMonoSlashed.ttf"
+	mv "${WORKDIR}/${MY_PN}SansMonoDotted-${PV}.ttf" \
+		"${S}/${MY_PN}SansMonoDotted.ttf"
 }
diff --git a/media-fonts/droid/metadata.xml b/media-fonts/droid/metadata.xml
index 22694e8ffcc1..e5b3bfb775bd 100644
--- a/media-fonts/droid/metadata.xml
+++ b/media-fonts/droid/metadata.xml
@@ -6,8 +6,4 @@
     <email>yngwin@gentoo.org</email>
     <name>Ben de Groot</name>
   </maintainer>
-  <use>
-    <flag name="slashed">Changes zero character in monotyped font to be slashed</flag>
-    <flag name="dotted">Changes zero character in monotyped font to be dotted</flag>
-  </use>
 </pkgmetadata>