Fixup ebuild as per bug 216331.

Package-Manager: portage-2.1.5.3

4 files changed, 30 insertions, 21 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/Manifest b/media-fonts/culmus/Manifest
index 90e263ed586e..ad64c619a67f 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,12 +1,11 @@
 DIST comix.tar.gz 100296 RMD160 a6f436a2fac0402c0dfa03f45de224315b8e1da4 SHA1 1ed4f31348d8b9ca99d4440c879f40c10e7c81b1 SHA256 567a0672c74dd4a772b055affe271bc1a41654f2b4f533aae905cc13d571d58d
-DIST culmus-0.100.tar.gz 1036020 RMD160 b00db3bd6275edfbb988cb71af182fed5551c06a SHA1 ea7e04d2a07b3bbab81b22178581374d4507bf41 SHA256 a674011f26591de24938a6bdd59d79e3022a3ddf5ba8683b458cec51ba458a27
 DIST culmus-0.101.tar.gz 1058016 RMD160 93246c3b3f5bf5b5c445c026c58f076fa81db338 SHA1 2380c246d5fd169f763b8e728391887d117d4538 SHA256 5a274774c0386a5dc1230a0a6ae443d224174bab7d989d4c22b7ba687a1bd442
 DIST dorian.tar.gz 19919 RMD160 d22c1b69a92c2ba5ee9f676715c2db221c37f7ef SHA1 068e2a7a2225564cc4c0c61e8afcbe616831b43a SHA256 ba4131cb164f0376e0269825042c5f64b9dfcf6905426938ab4d197831454633
 DIST gan.tar.gz 18076 RMD160 8897f105e90485851485262617508ea81db24966 SHA1 54e2473f68a9ddbece1d1a4f52115a1f95a5eb4e SHA256 a51f4f0a1782d1c33d251b2f59b47401351d0bdf4b5b5c634b850b5c5004b08d
 DIST gladia.tar.gz 25336 RMD160 ed91b9edaa98b3226ef2252bcce14595d6e276cf SHA1 dc20455dd4d2f4404011e82e27d078c7dda59c63 SHA256 6b972c34ec796880b4b2714401ef7f9ef0e733fee088e5974c9446d389d3e40d
 DIST ktav-yad.tar.gz 89373 RMD160 8c8cdb05210b5350785d5a6a333c1ea62b899a6d SHA1 0f3e93c5921d38ee21c459e8cab2870ffa4a0c92 SHA256 ebdeeac393a03ab50eb606ef709ab8d697104bcf284d8e1c5fb5eeaf50fbc888
 DIST ozrad.tar.gz 16709 RMD160 d63712fe2d32577f51a79a6a1f48914a72262de3 SHA1 20138f4f39c8fcaca6bac39c1e867a02b120404d SHA256 088809471bb16f2ea8322b1d4ffcc68336cf70c2db80f9dc4436a7c221ead858
-EBUILD culmus-0.100-r1.ebuild 1252 RMD160 abe0d34901c754fbb31948eb0b3ef0e740aa4555 SHA1 96ccd9c7761db28b05bb2a5adbabca48b7e1d8f7 SHA256 df64e724a81e62373802c32c9853fe4bd3e08584a2fa3fc4066a09cf449415cd
-EBUILD culmus-0.101-r1.ebuild 1305 RMD160 1cc1ff7c7b4f7d7189cb54fa73c432ab2aac0e9a SHA1 fc7335e6cef6685139fb671359d05b224f44434e SHA256 581361295811ce260a46e86fe8f97573e5f67af5a7cdadca2deba243ab3f8f52
-MISC ChangeLog 4299 RMD160 575a09841d6e574768fe28d1fdddfac74077ac5e SHA1 e4fd19a021955588b20d0c2497d2d74223af5405 SHA256 593c6bb087092a0a15ff837901c0362295552d559d55618f2e8c1f7a200275c0
+EBUILD culmus-0.101-r1.ebuild 1307 RMD160 47f047ce9cbb212dad4674564d49ac7942820b1c SHA1 935043ca4466eff777cf796a73f63726ad3634fe SHA256 6d3c4a37c490917eb1edd3ea28938618d9e1f63e007ce45bd0fca4d1b6326204
+EBUILD culmus-0.101-r2.ebuild 1185 RMD160 917d2f2ae7f279c4ae1f897cae1deb76aa341b8d SHA1 b2c818c7c6bd66b7242492133d9ee1540956a641 SHA256 33db92220c909f428ed1dc3ea5a32fdb4c26746afcd1faedd53ac8e4ad22eaf1
+MISC ChangeLog 4471 RMD160 1f0c74295dec2742deb236ee2b0e6dcaf4050dfc SHA1 6dfd596e59f706e1c5e35658b64eb84536c8983d SHA256 18c93bd52c390dc9a5f322cd86468f081562cb55cf1f53eb00e00bc13b1cca85
 MISC metadata.xml 184 RMD160 ab44fde1e4345b1982874b56974e57ac6b75a63c SHA1 1d3f1606e33657adb22d32506651bf8585604119 SHA256 b86fc6266c280e148a5a629217471a7ee69f7fe51c3cca9acbae23d7ec2bf53a
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"
 }