add fix & mark rev bump x86, cleanup

6 files changed, 19 insertions, 33 deletions

diff --git a/media-fonts/urw-fonts/ChangeLog b/media-fonts/urw-fonts/ChangeLog
index 563efe0605a7..d54b265f868d 100644
--- a/media-fonts/urw-fonts/ChangeLog
+++ b/media-fonts/urw-fonts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/urw-fonts
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/ChangeLog,v 1.10 2004/06/24 22:32:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/ChangeLog,v 1.11 2004/08/09 18:45:56 foser Exp $
+
+*urw-fonts-2.1-r2 (09 Aug 2004)
+
+  09 Aug 2004; foser <foser@gentoo.org> urw-fonts-2.1-r2.ebuild :
+  Fix it to not touch our fonts.conf
 
 *urw-fonts-2.1-r1 (22 Jun 2004)
 
diff --git a/media-fonts/urw-fonts/Manifest b/media-fonts/urw-fonts/Manifest
index 267bcb565e60..abe1082a4a3b 100644
--- a/media-fonts/urw-fonts/Manifest
+++ b/media-fonts/urw-fonts/Manifest
@@ -1,9 +1,11 @@
 MD5 8cfc47121c7529f983fdf2327900e99b urw-fonts-2.1.ebuild 736
 MD5 3a22ae0959c19dc45ad05ca1f9027b9f urw-fonts-2.1-r1.ebuild 601
 MD5 d7c6a98a5b11c95c9d52b62d047a28be urw-fonts-2.0-r1.ebuild 1387
+MD5 b54f11b6deefc389e5d713f3040f1693 urw-fonts-2.1-r2.ebuild 689
 MD5 888f2e83d66f44d99e6f6e7624e9bd66 ChangeLog 1721
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
 MD5 c93a1f8a8417b0864a0b328cca029055 files/fonts.conf 10193
 MD5 cfca3b77cb76ade070a8c4b123705aed files/digest-urw-fonts-2.1 69
 MD5 55bed1fe8e23fa03a0dfc0c4cb6fcbe1 files/digest-urw-fonts-2.0-r1 70
 MD5 cfca3b77cb76ade070a8c4b123705aed files/digest-urw-fonts-2.1-r1 69
+MD5 cfca3b77cb76ade070a8c4b123705aed files/digest-urw-fonts-2.1-r2 69
diff --git a/media-fonts/urw-fonts/files/digest-urw-fonts-2.1-r1 b/media-fonts/urw-fonts/files/digest-urw-fonts-2.1-r1
deleted file mode 100644
index c438cabbf135..000000000000
--- a/media-fonts/urw-fonts/files/digest-urw-fonts-2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1e56f7a056b9f36a556d8d76478bfb7c urw-fonts-2.1-7.src.rpm 3799204
diff --git a/media-fonts/urw-fonts/files/digest-urw-fonts-2.1 b/media-fonts/urw-fonts/files/digest-urw-fonts-2.1-r2
index c438cabbf135..c438cabbf135 100644
--- a/media-fonts/urw-fonts/files/digest-urw-fonts-2.1
+++ b/media-fonts/urw-fonts/files/digest-urw-fonts-2.1-r2
diff --git a/media-fonts/urw-fonts/urw-fonts-2.1-r1.ebuild b/media-fonts/urw-fonts/urw-fonts-2.1-r2.ebuild
index c40e6a69c5e4..acb4f6cd6a48 100644
--- a/media-fonts/urw-fonts/urw-fonts-2.1-r1.ebuild
+++ b/media-fonts/urw-fonts/urw-fonts-2.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/urw-fonts-2.1-r1.ebuild,v 1.3 2004/07/14 17:11:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/urw-fonts-2.1-r2.ebuild,v 1.1 2004/08/09 18:45:56 foser Exp $
 
 inherit eutils rpm font
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://rpmfind.net/linux/fedora/core/development/SRPMS/${P}-7.src.rpm"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 #DEPEND="app-arch/rpm2targz"
@@ -20,3 +20,12 @@ S=${WORKDIR}
 FONT_S="${S}"
 FONT_SUFFIX="afm pfb"
 DOCS="ChangeLog README* TODO"
+
+src_install () {
+
+	font_src_install
+
+	# don't touch our fonts.conf
+	rm -fr ${D}/etc
+
+}
diff --git a/media-fonts/urw-fonts/urw-fonts-2.1.ebuild b/media-fonts/urw-fonts/urw-fonts-2.1.ebuild
deleted file mode 100644
index 8ae745a7501f..000000000000
--- a/media-fonts/urw-fonts/urw-fonts-2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/urw-fonts-2.1.ebuild,v 1.6 2004/07/14 17:11:04 agriffis Exp $
-
-inherit eutils rpm
-
-DESCRIPTION="free good quality fonts gpl'd by URW++"
-HOMEPAGE=""
-SRC_URI="ftp://rpmfind.net/linux/fedora/core/development/SRPMS/${P}-7.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
-IUSE=""
-
-#DEPEND="app-arch/rpm2targz"
-#DEPEND comes from rpm.eclass
-
-S=${WORKDIR}
-FONTPATH="/usr/share/fonts/${PN}"
-
-src_install() {
-	insinto ${FONTPATH}
-	doins *.afm *.pfb fonts.*
-	if [ -x /usr/bin/fc-cache ] ; then
-		/usr/bin/fc-cache -f ${D}${FONTPATH}
-	fi
-	dodoc ChangeLog README* TODO
-}