Fixup ebuild as per bug 216331.

(Portage version: 2.1.5.3)

3 files changed, 27 insertions, 17 deletions

diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index 40f1c6427b52..240f16331e52 100644
--- a/media-fonts/culmus/ChangeLog
+++ b/media-fonts/culmus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/culmus
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.23 2008/03/29 15:59:20 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.24 2008/06/05 12:37:03 loki_val Exp $
+
+*culmus-0.101-r2 (05 Jun 2008)
+
+  05 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -culmus-0.100-r1.ebuild, +culmus-0.101-r2.ebuild:
+  Fixup ebuild as per bug 216331.
 
   29 Mar 2008; Santiago M. Mola <coldwind@gentoo.org>
   culmus-0.101-r1.ebuild:
diff --git a/media-fonts/culmus/culmus-0.101-r1.ebuild b/media-fonts/culmus/culmus-0.101-r1.ebuild
index d66ab968523d..61abfbb25fdd 100644
--- a/media-fonts/culmus/culmus-0.101-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.101-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.101-r1.ebuild,v 1.8 2008/03/29 15:59:20 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.101-r1.ebuild,v 1.9 2008/06/05 12:37:03 loki_val Exp $
 
 inherit font
 
@@ -23,7 +23,7 @@ DOCS="CHANGES LICENSE LICENSE-BITSTREAM"
 
 src_unpack() {
 	unpack ${A}
-	mv *.{afm,pfa} ${S}
+	mv *.{afm,pfa} "${S}"
 }
 
 src_install () {
diff --git a/media-fonts/culmus/culmus-0.100-r1.ebuild b/media-fonts/culmus/culmus-0.101-r2.ebuild
index 36de10cf2296..d66d063a06b7 100644
--- a/media-fonts/culmus/culmus-0.100-r1.ebuild
+++ b/media-fonts/culmus/culmus-0.101-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.100-r1.ebuild,v 1.8 2007/03/19 14:44:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.101-r2.ebuild,v 1.1 2008/06/05 12:37:03 loki_val Exp $
+
+inherit font
 
 DESCRIPTION="Hebrew Type1 fonts"
 SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
@@ -11,24 +13,26 @@ SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
 	http://culmus.sourceforge.net/fancy/comix.tar.gz
 	http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz"
 HOMEPAGE="http://culmus.sourceforge.net/"
-KEYWORDS="x86 ppc ~amd64 alpha"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
 IUSE=""
 
-FONTPATH="/usr/share/fonts/${PN}"
+S="${WORKDIR}/${P}"
+FONT_S="${S}"
+FONT_SUFFIX="afm pfa"
+FONT_CONF=( "65-culmus.conf" )
+DOCS="CHANGES"
 
-src_install () {
-	dodir ${FONTPATH}
-	cp -pPR * ${D}${FONTPATH}
-	cp -pPR ${WORKDIR}/*.{afm,pfa}  ${D}${FONTPATH}
-	rm ${D}${FONTPATH}/{CHANGES,LICENSE,LICENSE-BITSTREAM,GNU-GPL,culmus.spec}
-	dodoc CHANGES LICENSE LICENSE-BITSTREAM
+src_unpack() {
+	unpack ${A}
+	mv *.afm *.pfa "${S}"/
+	cd "${S}"
+	mv culmus.conf 65-culmus.conf
 }
 
 pkg_postinst() {
-	elog "Please add ${FONTPATH} to your FontPath"
-	elog "in XF86Config to make the fonts available to all X11 apps and"
-	elog "not just those that use fontconfig (the latter category includes"
-	elog "kde 3.1 and gnome 2.2)."
+	elog "This font contains support for fontconfig, which may make"
+	elog "it render more smoothly. To enable it, do:"
+	elog "eselect fontconfig enable 65-culmus.conf"
 }