4 files changed, 45 insertions, 51 deletions
diff --git a/media-fonts/urw-fonts/ChangeLog b/media-fonts/urw-fonts/ChangeLog
index 18b480868b15..0fc5dc44609c 100644
--- a/media-fonts/urw-fonts/ChangeLog
+++ b/media-fonts/urw-fonts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/urw-fonts
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/ChangeLog,v 1.20 2007/02/22 01:16:58 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/urw-fonts/ChangeLog,v 1.21 2007/06/24 06:56:38 dirtyepic Exp $
+
+*urw-fonts-2.3.6 (24 Jun 2007)
+
+  24 Jun 2007; Ryan Hill <dirtyepic@gentoo.org> -urw-fonts-2.0-r1.ebuild,
+  +urw-fonts-2.3.6.ebuild:
+  Version bump.  (Ed Catmur, bug #163677.)  Remove old.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-fonts/urw-fonts/files/digest-urw-fonts-2.3.6 b/media-fonts/urw-fonts/files/digest-urw-fonts-2.3.6
new file mode 100644
index 000000000000..d9f669000660
--- /dev/null
+++ b/media-fonts/urw-fonts/files/digest-urw-fonts-2.3.6
@@ -0,0 +1,3 @@
+MD5 2a6d8b62c824214fe165123d9e9d318d urw-fonts-2.3-6.1.1.src.rpm 5283387
+RMD160 8c6a3706e74a24a4c9baed39c78c8cf3afa31cfd urw-fonts-2.3-6.1.1.src.rpm 5283387
+SHA256 b9beb0a35d3c90afbde34fab6dc4523fa7a8f31235bf9ce604d53297b0683272 urw-fonts-2.3-6.1.1.src.rpm 5283387
diff --git a/media-fonts/urw-fonts/urw-fonts-2.0-r1.ebuild b/media-fonts/urw-fonts/urw-fonts-2.0-r1.ebuild
deleted file mode 100644
index 9cdabeaa8854..000000000000
--- a/media-fonts/urw-fonts/urw-fonts-2.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 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.0-r1.ebuild,v 1.10 2005/08/23 21:41:51 gustavoz Exp $
-
-inherit eutils
-
-DESCRIPTION="free good quality fonts gpl'd by URW++"
-HOMEPAGE="http://www.urwpp.de/"
-SRC_URI="mirror://gentoo/urw-fonts-2.0-29.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp ${DISTDIR}/${A} ${WORKDIR}
-	cd ${S}
-	rpm2targz ${A}
-	tar -xzf ${A/.rpm/.tar.gz}
-	tar -xjf urw-fonts-2.0.tar.bz2
-	tar -xjf urw-symbol.tar.bz2
-	mv s050000l.* fonts/
-	tar -xjf urw-tweaks.tar.bz2
-	mv n019003l.* fonts/
-	tar -xjf urw-dingbats.tar.bz2
-	mv d050000l.* fonts/
-	epatch urw-fonts-2.0-encodings.patch
-}
-
-src_install() {
-	cd ${S}/fonts
-	mkdir -p ${D}/usr/share/fonts/default/Type1
-	cp -f *.afm *.pfb ${D}/usr/share/fonts/default/Type1
-	cp ${S}/fonts/fonts.scale ${D}/usr/share/fonts/default/Type1/
-	mkdir -p ${D}/etc/fonts
-	# Don't add this, it makes no changes not already needed in fonts.conf
-	# Brad Laue <brad@gentoo.org> 08/07/2003
-#	cp ${FILESDIR}/fonts.conf ${D}/etc/fonts/
-}
-
-pkg_postinst() {
-	# this just doesn't work here...i'm going to see if i can make it work later
-	# cat ${S}/fonts/fonts.scale >> /usr/share/fonts/default/Type1/fonts.scale
-	mkfontdir /usr/share/fonts/default/Type1
-}
diff --git a/media-fonts/urw-fonts/urw-fonts-2.3.6.ebuild b/media-fonts/urw-fonts/urw-fonts-2.3.6.ebuild
new file mode 100644
index 000000000000..a79b9421d0ac
--- /dev/null
+++ b/media-fonts/urw-fonts/urw-fonts-2.3.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 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.3.6.ebuild,v 1.1 2007/06/24 06:56:38 dirtyepic Exp $
+
+inherit eutils rpm font versionator
+
+MY_PV=$(replace_version_separator 2 -)
+
+DESCRIPTION="free good quality fonts gpl'd by URW++"
+HOMEPAGE="http://www.urwpp.de/"
+SRC_URI="ftp://rpmfind.net/linux/fedora/development/source/SRPMS/${PN}-${MY_PV}.1.1.src.rpm"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+#DEPEND="app-arch/rpm2targz"
+#DEPEND comes from rpm.eclass
+
+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
+
+}