Version bump. Drop old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 17 insertions, 84 deletions

diff --git a/media-fonts/culmus/ChangeLog b/media-fonts/culmus/ChangeLog
index 8ebf5614809a..90acf6d34a2b 100644
--- a/media-fonts/culmus/ChangeLog
+++ b/media-fonts/culmus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-fonts/culmus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.48 2010/07/20 16:13:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/ChangeLog,v 1.49 2010/08/30 11:23:45 pva Exp $
+
+*culmus-0.105 (30 Aug 2010)
+
+  30 Aug 2010; Peter Volkov <pva@gentoo.org> -culmus-0.103.ebuild,
+  -culmus-0.103-r1.ebuild, -culmus-0.104.ebuild, +culmus-0.105.ebuild:
+  Version bump. Drop old.
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> culmus-0.104-r1.ebuild:
   Stable for HPPA (bug #322973).
diff --git a/media-fonts/culmus/Manifest b/media-fonts/culmus/Manifest
index 6de3125ab43e..6e3a35927fdf 100644
--- a/media-fonts/culmus/Manifest
+++ b/media-fonts/culmus/Manifest
@@ -1,19 +1,16 @@
-DIST anka-otf.zip 15148 RMD160 f2a7d0b0d6c372634797e44ba3d6d94e772bdec6 SHA1 d7d2702a93669e287255ce2eded506c5845c0c2e SHA256 20ae14b84102623e246869be327be6a0fc238b3d07d23e4042fa865693f1e916
 DIST anka.tar.gz 21210 RMD160 99c8d971f39fdc6ba82d74f3bbc2952702261423 SHA1 3ba33c83d666f558d06050c7f6f94cd92367fd4b SHA256 1e62cf0f3782c59742bab2ee7a04c515caf61d9096b911522794b622c180f1d8
 DIST comix.tar.gz 100296 RMD160 a6f436a2fac0402c0dfa03f45de224315b8e1da4 SHA1 1ed4f31348d8b9ca99d4440c879f40c10e7c81b1 SHA256 567a0672c74dd4a772b055affe271bc1a41654f2b4f533aae905cc13d571d58d
-DIST culmus-0.103.tar.gz 1005923 RMD160 68974b309ae8b10a0fc886bd1bece70ba273e0e7 SHA1 2224f61f4d1329ab1726421491ea6367d04917c7 SHA256 f5274372c400b7e4f0f6589d6808ce871187fdba9e4bdf76e8281ce467adcab1
 DIST culmus-0.104.tar.gz 988587 RMD160 9b6bc0b5fc23f7b88fb9e6dbe41b37dc5be84e32 SHA1 a2f6291c227be29134328fd067f15d3c2db46d26 SHA256 f9ca2b4e3432e581877ec49d33e842a36211763cec0b1c53f5e6bc4248645d84
+DIST culmus-0.105.tar.gz 855530 RMD160 4cdd96442dfbf4fcf8349f92c05fae022527d5fa SHA1 139a9a44dea20c3238627069b966e3295c8638e7 SHA256 693e0ef9f0eaf8ba6be1c4999a770d11cbd73fd5e5c1b3d95f4cbb86dc6dd1fa
 DIST culmus-type1-0.104.tar.gz 231154 RMD160 8c61c5c1251125740c63752ba1d0236accc2ba98 SHA1 b363bad5f7fdc6da1598f90c4a2d309b26296a72 SHA256 4f2483075ce8dc6d8c59ca734b1efc9534ef03f3e4d8ffd489e53de2f03cde93
-DIST david-type1-0.103.tar.gz 161181 RMD160 325093815cb3220d163dd284ab11c5a738d938a7 SHA1 8ab06f3227b8a43bddc09694510e5eaca46ac525 SHA256 15f721e8d5bc4f91daa352c70de0d71b0b284c045f6420b71e0803deedebf745
+DIST culmus-type1-0.105.tar.gz 465679 RMD160 4666f5369141efafdec62778e30b1db71c37dd4f SHA1 05e28b0c7badd6027de151c31cd0a1b5741fa48b SHA256 9365c01aeda7de344fe158366f8622dea9061d9d86b420781bea07aa4a975bf0
 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 hillel.tar.gz 23084 RMD160 5ff96ce2cb80dbabc80d0ce709fbf983a637aeee SHA1 c39aed3a11830ef9808abde6bb732e95c226a1d8 SHA256 30c9505bcb1688c5e370e6b2161876f61c1bd0c73befca55e803ef7860d99781
 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.103-r1.ebuild 1299 RMD160 e0f921a6ae40cd3d685c9a50f41e0e8f5fd81f30 SHA1 ab1933d38d96f2084b4e1633a585571b276af51a SHA256 18d5d6f2869e8e736a2fb0a9304387e4bb3b32678e3c68e8a016b3c15da8e497
-EBUILD culmus-0.103.ebuild 1123 RMD160 1f2692f5cd545c892b8929d2f4f7b16d50ce7946 SHA1 ab8a28354739214c64fdba5f21a1baf0544336bb SHA256 df1d0904816ce0ff4278e2c5518ff70da8c9c86957aebd9fc614d779034a0cd4
 EBUILD culmus-0.104-r1.ebuild 1341 RMD160 29bb0336e75a86e789ea60f47efa594ac4114689 SHA1 6524430e7d1bcb0eb0deea8b1066dae7a52328cf SHA256 d07cc50082f9dcc72dd28e2f2cff931b3eb2554229d05811ef28c1e23badfe96
-EBUILD culmus-0.104.ebuild 1296 RMD160 ee8597b31eea4852f33b7d1d9773236fe7b71a92 SHA1 0c50c5e0a254b1dba9a9c81307e5e70c21dcec06 SHA256 c2b8f1cd0cbc58c5ddfd0dd273f40740ed5860e6b726e4618158fe97bddb0407
-MISC ChangeLog 7317 RMD160 294a206aa7aa16cb4e1e0fbd02177086c6789b58 SHA1 ef5da3d873c883e8cf6f3278c1ee1d282bbd3a04 SHA256 235bbe0a6118db8138e904a777ec1de0626e6a177b155f29a66de95969c36a0c
+EBUILD culmus-0.105.ebuild 1349 RMD160 c35f7bf882505aee2c5cb26080687e466f70d4ce SHA1 6d100a0427aa2683a9800f2e72204afa914a8d5a SHA256 ea69974468ca6e46d251e235bd4ec2c39dcaab717fef1ed6b9686932f5846434
+MISC ChangeLog 7511 RMD160 b5348ea8b40203c8bdc8641e67e99a03fd9a326e SHA1 dddcc440a050a8e6609850b57a5c24c480a827f3 SHA256 f8466472412c6ca4e0fd4746634872b556dab873954f527283721cbaf92abf76
 MISC metadata.xml 158 RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca SHA1 8e4ca6d183e52cdbea8cfba08b7a7910e648fc84 SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8
diff --git a/media-fonts/culmus/culmus-0.103-r1.ebuild b/media-fonts/culmus/culmus-0.103-r1.ebuild
deleted file mode 100644
index 44af1a844ded..000000000000
--- a/media-fonts/culmus/culmus-0.103-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.103-r1.ebuild,v 1.1 2009/11/03 09:22:22 pva Exp $
-
-inherit font
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/david-type1-${PV}.tar.gz
-	http://culmus.sourceforge.net/fancy/hillel.tar.gz
-	http://culmus.sourceforge.net/fancy/anka.tar.gz
-	http://culmus.sourceforge.net/fancy/comix.tar.gz
-	http://culmus.sourceforge.net/fancy/gan.tar.gz
-	http://culmus.sourceforge.net/fancy/ozrad.tar.gz
-	http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz
-	http://culmus.sourceforge.net/fancy/dorian.tar.gz
-	http://culmus.sourceforge.net/fancy/gladia.tar.gz"
-# Some fonts are available in otf format too. Do we need them?
-#	http://culmus.sourceforge.net/fancy/anka-otf.zip
-#	http://culmus.sourceforge.net/fancy/hillel-otf.zip
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-FONT_SUFFIX="afm pfa ttf"
-FONT_CONF=( "65-culmus.conf" )
-DOCS="CHANGES"
-
-src_unpack() {
-	unpack ${A}
-	mv *.afm *.pfa "${S}"/
-	cd "${S}"
-	mv culmus.conf 65-culmus.conf
-}
diff --git a/media-fonts/culmus/culmus-0.103.ebuild b/media-fonts/culmus/culmus-0.103.ebuild
deleted file mode 100644
index 2dd8c44e603d..000000000000
--- a/media-fonts/culmus/culmus-0.103.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.103.ebuild,v 1.9 2009/09/07 21:15:29 dirtyepic Exp $
-
-inherit font
-
-DESCRIPTION="Hebrew Type1 fonts"
-HOMEPAGE="http://culmus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/culmus/${P}.tar.gz
-	mirror://sourceforge/culmus/david-type1-${PV}.tar.gz
-	http://culmus.sourceforge.net/fancy/anka.tar.gz
-	http://culmus.sourceforge.net/fancy/anka-otf.zip
-	http://culmus.sourceforge.net/fancy/comix.tar.gz
-	http://culmus.sourceforge.net/fancy/gan.tar.gz
-	http://culmus.sourceforge.net/fancy/ozrad.tar.gz
-	http://culmus.sourceforge.net/fancy/ktav-yad.tar.gz
-	http://culmus.sourceforge.net/fancy/dorian.tar.gz
-	http://culmus.sourceforge.net/fancy/gladia.tar.gz"
-
-LICENSE="|| ( GPL-2 LICENSE-BITSTREAM )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-FONT_SUFFIX="afm pfa ttf"
-FONT_CONF=( "65-culmus.conf" )
-DOCS="CHANGES"
-
-src_unpack() {
-	unpack ${A}
-	mv *.afm *.pfa "${S}"/
-	cd "${S}"
-	mv culmus.conf 65-culmus.conf
-}
diff --git a/media-fonts/culmus/culmus-0.104.ebuild b/media-fonts/culmus/culmus-0.105.ebuild
index 3514a1dcf9d0..5e0cc1761b5b 100644
--- a/media-fonts/culmus/culmus-0.104.ebuild
+++ b/media-fonts/culmus/culmus-0.105.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.104.ebuild,v 1.1 2010/01/20 09:26:38 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/culmus/culmus-0.105.ebuild,v 1.1 2010/08/30 11:23:45 pva Exp $
+
+EAPI="2"
 
 inherit font
 
@@ -29,9 +31,8 @@ FONT_SUFFIX="afm pfa ttf"
 FONT_CONF=( "65-culmus.conf" )
 DOCS="CHANGES"
 
-src_unpack() {
-	unpack ${A}
-	mv *.afm *.pfa "${S}"/
-	cd "${S}"
+src_prepare() {
+	mv "${WORKDIR}"/*.{afm,pfa} "${S}"
+	mv "${WORKDIR}"/${PN}-type1-${PV}/*.{afm,pfa} "${S}"
 	mv culmus.conf 65-culmus.conf
 }