fix fontforge dep, bug 183132, remove a few old versions

(Portage version: 2.1.3_rc5)

7 files changed, 10 insertions, 237 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index eecc752efe72..9660f3675f8c 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.60 2007/06/23 17:02:26 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.61 2007/06/27 13:50:04 hkbst Exp $
+
+  27 Jun 2007; Marijn Schouten <hkBst@gentoo.org> -lilypond-2.10.25.ebuild,
+  lilypond-2.10.25-r1.ebuild, -lilypond-2.11.26.ebuild,
+  lilypond-2.11.27.ebuild:
+  fix fontforge dep, bug 183132, remove a few old versions
 
   23 Jun 2007; Marijn Schouten <hkBst@gentoo.org> -lilypond-2.10.23.ebuild,
   -lilypond-2.11.23.ebuild:
diff --git a/media-sound/lilypond/files/digest-lilypond-2.10.25 b/media-sound/lilypond/files/digest-lilypond-2.10.25
deleted file mode 100644
index 5db91d2a7546..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-2.10.25
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3b269dd092db621b1c25fb390b4347f3 lilypond-2.10.25.tar.gz 2660089
-RMD160 34f9d78dc44859016b02e0ec0a33267e7989986b lilypond-2.10.25.tar.gz 2660089
-SHA256 ddcbeb54475718b7cd6c3c85d98490d4597fcce5612cd4e5aaf1370d877d4cdf lilypond-2.10.25.tar.gz 2660089
diff --git a/media-sound/lilypond/files/digest-lilypond-2.11.26 b/media-sound/lilypond/files/digest-lilypond-2.11.26
deleted file mode 100644
index 044bf175b02f..000000000000
--- a/media-sound/lilypond/files/digest-lilypond-2.11.26
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbd677508a95b7d434f07bad4cefa50e lilypond-2.11.26.tar.gz 3182071
-RMD160 c56741f3939b6233dcb833b09b64cab49f079cf0 lilypond-2.11.26.tar.gz 3182071
-SHA256 6aab4b57ef4460838b2f1dba43f6b6a0984f406e8828d7ce6f63b2e88ba123f1 lilypond-2.11.26.tar.gz 3182071
diff --git a/media-sound/lilypond/lilypond-2.10.25-r1.ebuild b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
index 6ba6c9c41718..2abcbc097a17 100644
--- a/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25-r1.ebuild,v 1.5 2007/06/23 16:52:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25-r1.ebuild,v 1.6 2007/06/27 13:50:04 hkbst Exp $
 
 inherit eutils versionator toolchain-funcs elisp-common
 
@@ -36,7 +36,7 @@ RDEPEND="
 #	virtual/tetex
 
 DEPEND="${RDEPEND}
-	>=media-gfx/fontforge-20060406
+	>=media-gfx/fontforge-20070501
 	>=app-text/mftrace-1.2.9
 	>=sys-apps/texinfo-4.8
 	sys-devel/make
diff --git a/media-sound/lilypond/lilypond-2.10.25.ebuild b/media-sound/lilypond/lilypond-2.10.25.ebuild
deleted file mode 100644
index 591fc751fa71..000000000000
--- a/media-sound/lilypond/lilypond-2.10.25.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25.ebuild,v 1.3 2007/06/23 16:52:55 flameeyes Exp $
-
-inherit eutils versionator toolchain-funcs
-
-DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
-HOMEPAGE="http://lilypond.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-#LANGS="cs da de es fi fr it ja nl ru rw sv tr zh_TW"
-IUSE="debug profile"
-#IUSE="debug doc emacs gtk profile vim"
-
-#for X in ${LANGS} ; do
-#		 IUSE="${IUSE} linguas_${X/-/_}"
-#done
-
-# guile with deprecated and regex
-RDEPEND="
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=x11-libs/pango-1.12.3
-	>=dev-scheme/guile-1.8.1
-	>=dev-lang/python-2.4
-	|| ( >=app-text/ghostscript-gnu-8.15
-		 >=app-text/ghostscript-gpl-8.15
-		 >=app-text/ghostscript-esp-8.15 )"
-#	>=app-text/ghostscript-gnu-8.55"
-
-#	virtual/tetex
-
-DEPEND="${RDEPEND}
-	>=media-gfx/fontforge-20060406
-	<=media-gfx/fontforge-20070312
-	>=app-text/mftrace-1.2.9
-	>=sys-apps/texinfo-4.8
-	sys-devel/make
-	sys-devel/gettext
-	sys-devel/flex
-	dev-lang/perl
-	>=sys-devel/bison-2.0"
-#	doc? (	media-libs/netpbm
-#		media-gfx/imagemagick )"
-
-pkg_setup() {
-	if has_version =dev-scheme/guile-1.8*; then
-		local flags="deprecated regex"
-		built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flags"
-	fi
-}
-
-src_compile() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		eerror "You need GCC 4.x to build this software."
-		die "you need to compile with gcc-4 or later"
-	fi
-
-	econf \
-		$(use_enable debug debugging) \
-		$(use_enable profile profiling) \
-		--disable-gui \
-		--disable-documentation
-#		$(use_enable doc documentation) \
-
-
-	# without -j1 it will not fail, but building docs later will
-	emake -j1 || die "emake failed"
-
-#	if use doc; then
-#		emake -j1 web || die "emake web failed"
-#	fi
-}
-
-# lilypond doesn't include the answers to the tests.
-# You are supposed to build those yourself with an
-# earlier version. Then running tests will compare the
-# results of the tests against the results from the
-# earlier version. As such, tests seem mostly useless
-# for our purposes.
-RESTRICT=test
-
-src_install () {
-	emake DESTDIR=${D} vimdir=/usr/share/vim/vimfiles install || die "emake install failed"
-
-#	if use doc; then
-#		# Note: installs .html docs, .pdf docs and examples
-#		emake out=www web-install DESTDIR=${D} \
-#			webdir=/usr/share/doc/${PF}/html || die "emake web-install failed"
-#	fi
-
-	dodoc AUTHORS.txt ChangeLog DEDICATION NEWS.txt README.txt THANKS
-
-#	use vim || rm -r ${D}/usr/share/vim
-#	use emacs || rm -r ${D}/usr/share/emacs
-}
diff --git a/media-sound/lilypond/lilypond-2.11.26.ebuild b/media-sound/lilypond/lilypond-2.11.26.ebuild
deleted file mode 100644
index e224fca2f963..000000000000
--- a/media-sound/lilypond/lilypond-2.11.26.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.11.26.ebuild,v 1.3 2007/06/23 16:52:55 flameeyes Exp $
-
-inherit eutils versionator toolchain-funcs elisp-common
-
-DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
-HOMEPAGE="http://lilypond.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-#LANGS="cs da de es fi fr it ja nl ru rw sv tr zh_TW"
-IUSE="debug emacs profile"
-#IUSE="debug doc emacs gtk profile vim"
-
-#for X in ${LANGS} ; do
-#		 IUSE="${IUSE} linguas_${X/-/_}"
-#done
-
-# guile with deprecated and regex
-RDEPEND="
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=x11-libs/pango-1.12.3
-	>=dev-scheme/guile-1.8.1
-	>=dev-lang/python-2.4
-	|| ( >=app-text/ghostscript-gnu-8.15
-		 >=app-text/ghostscript-gpl-8.15
-		 >=app-text/ghostscript-esp-8.15 )
-	emacs? ( virtual/emacs )"
-#	>=app-text/ghostscript-gnu-8.55"
-
-#	virtual/tetex
-
-#	>=media-gfx/fontforge-20060406
-#	<=media-gfx/fontforge-20070312
-
-DEPEND="${RDEPEND}
-	media-gfx/fontforge
-	>=app-text/mftrace-1.2.9
-	>=sys-apps/texinfo-4.8
-	sys-devel/make
-	sys-devel/gettext
-	sys-devel/flex
-	dev-lang/perl
-	>=sys-devel/bison-2.0"
-#	doc? (	media-libs/netpbm
-#		media-gfx/imagemagick )"
-
-pkg_setup() {
-	if has_version =dev-scheme/guile-1.8*; then
-		local flags="deprecated regex"
-		built_with_use dev-scheme/guile ${flags} || die "guile must be built with \"${flags}\" use flags"
-	fi
-}
-
-src_compile() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		eerror "You need GCC 4.x to build this software."
-		die "you need to compile with gcc-4 or later"
-	fi
-
-	econf \
-		$(use_enable debug debugging) \
-		$(use_enable profile profiling) \
-		--disable-gui \
-		--disable-documentation
-#		$(use_enable doc documentation) \
-
-
-	# without -j1 it will not fail, but building docs later will
-	emake -j1 || die "emake failed"
-
-#	if use doc; then
-#		emake -j1 web || die "emake web failed"
-#	fi
-
-	if use emacs; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-# lilypond doesn't include the answers to the tests.
-# You are supposed to build those yourself with an
-# earlier version. Then running tests will compare the
-# results of the tests against the results from the
-# earlier version. As such, tests seem mostly useless
-# for our purposes.
-RESTRICT=test
-
-src_install () {
-	emake DESTDIR=${D} vimdir=/usr/share/vim/vimfiles install || die "emake install failed"
-
-#	if use doc; then
-#		# Note: installs .html docs, .pdf docs and examples
-#		emake out=www web-install DESTDIR=${D} \
-#			webdir=/usr/share/doc/${PF}/html || die "emake web-install failed"
-#	fi
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${D}"/usr/share/emacs
-
-	if use emacs; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	dodoc AUTHORS.txt ChangeLog DEDICATION NEWS.txt README.txt THANKS
-
-#	use vim || rm -r ${D}/usr/share/vim
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.11.27.ebuild b/media-sound/lilypond/lilypond-2.11.27.ebuild
index cfe237a7690c..af1d6ec7db85 100644
--- a/media-sound/lilypond/lilypond-2.11.27.ebuild
+++ b/media-sound/lilypond/lilypond-2.11.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.11.27.ebuild,v 1.2 2007/06/23 16:52:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.11.27.ebuild,v 1.3 2007/06/27 13:50:04 hkbst Exp $
 
 inherit eutils versionator toolchain-funcs elisp-common
 
@@ -35,11 +35,9 @@ RDEPEND="
 
 #	virtual/tetex
 
-#	>=media-gfx/fontforge-20060406
-#	<=media-gfx/fontforge-20070312
 
 DEPEND="${RDEPEND}
-	media-gfx/fontforge
+	>=media-gfx/fontforge-20070501
 	>=app-text/mftrace-1.2.9
 	>=sys-apps/texinfo-4.8
 	sys-devel/make