Add Emacs support.

Package-Manager: portage-2.1.2.9

5 files changed, 164 insertions, 5 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 977e6df615da..68b887f868c7 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,13 @@
 # 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.53 2007/05/24 11:35:06 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.54 2007/06/01 12:53:52 ulm Exp $
+
+*lilypond-2.10.25-r1 (01 Jun 2007)
+
+  01 Jun 2007; Ulrich Mueller <ulm@gentoo.org> +files/50lilypond-gentoo.el,
+  +lilypond-2.10.25-r1.ebuild:
+  Emacs support: Compile elisp files and install them in the proper place,
+  add an Emacs sitefile. Also fixes bug #179177.
 
 *lilypond-2.10.25 (24 May 2007)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index e9bab8a37c2f..f3861caf3585 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 50lilypond-gentoo.el 258 RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 SHA1 e9fa3b4ae260183cd2f290fcf84b9991dbcd7875 SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7
+MD5 2f035ac60c8fe7a5aba52abffb88a950 files/50lilypond-gentoo.el 258
+RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 files/50lilypond-gentoo.el 258
+SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7 files/50lilypond-gentoo.el 258
 AUX lilypond-2.0.0-coreutils-compat.patch 5638 RMD160 0f6620c39939013ec2460728881bbe0d2edc60f2 SHA1 cfed6d9d5a6a6c65767e1fd8deded90e61649354 SHA256 b40f47a164a9f29ed0d98a4ddac91293ec3347044c97042726f96b361417749c
 MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
 RMD160 0f6620c39939013ec2460728881bbe0d2edc60f2 files/lilypond-2.0.0-coreutils-compat.patch 5638
@@ -20,6 +27,10 @@ EBUILD lilypond-2.10.23.ebuild 2768 RMD160 60d4da6d9ce1a35e1ec9ce41061c59d5f8341
 MD5 a71d9719b85c8b563aba31ca8eaa92a7 lilypond-2.10.23.ebuild 2768
 RMD160 60d4da6d9ce1a35e1ec9ce41061c59d5f8341677 lilypond-2.10.23.ebuild 2768
 SHA256 2ddfb2efea1ae71d5ee4141afb2f3073467230e0de6a71e8529dc3cc6e4cf59a lilypond-2.10.23.ebuild 2768
+EBUILD lilypond-2.10.25-r1.ebuild 3207 RMD160 b9618faff7c11ba6940cc415941f24874928ae1b SHA1 472d60d02a5b1d28411fbb6c6b629a0856015f6f SHA256 7eaca819407598dc424f1d38d1f3fb602f339540b1cbc2feb6d3704f227435d3
+MD5 182a96afd4a2e579c2810e5f5fb58a70 lilypond-2.10.25-r1.ebuild 3207
+RMD160 b9618faff7c11ba6940cc415941f24874928ae1b lilypond-2.10.25-r1.ebuild 3207
+SHA256 7eaca819407598dc424f1d38d1f3fb602f339540b1cbc2feb6d3704f227435d3 lilypond-2.10.25-r1.ebuild 3207
 EBUILD lilypond-2.10.25.ebuild 2734 RMD160 ee4ab897f9fc259eabd850df63a0f8e2e87738da SHA1 d736036258c2bee69a33527e5e51472ff97f13f5 SHA256 b3d92002164a5a754a00bf0142f96f50c4f88d45f7dd4c001bbbc13a14e688bb
 MD5 73f714239c793a1956af0c20f59c07bc lilypond-2.10.25.ebuild 2734
 RMD160 ee4ab897f9fc259eabd850df63a0f8e2e87738da lilypond-2.10.25.ebuild 2734
@@ -48,10 +59,10 @@ EBUILD lilypond-2.8.0-r1.ebuild 2415 RMD160 ab0134b3d928fe7c871311f0c06413e71de8
 MD5 a780c82186918eb0d9e245f425684a45 lilypond-2.8.0-r1.ebuild 2415
 RMD160 ab0134b3d928fe7c871311f0c06413e71de886af lilypond-2.8.0-r1.ebuild 2415
 SHA256 25f7654f24d1f400f5ae8f62c832f1e5018a28a898bde92d222919227e8024a3 lilypond-2.8.0-r1.ebuild 2415
-MISC ChangeLog 9431 RMD160 247568de0fe4250db9d21d09643afe268ef5d66c SHA1 5c7aaf1bbb981cd170df93ed3fce915f84c067ad SHA256 767548899e5609f08a9811b50514324e2c3ec501bc5ebfb3a0f6b278cb6cda7a
-MD5 cc253537487f508b8b043c9bc6a6c4ac ChangeLog 9431
-RMD160 247568de0fe4250db9d21d09643afe268ef5d66c ChangeLog 9431
-SHA256 767548899e5609f08a9811b50514324e2c3ec501bc5ebfb3a0f6b278cb6cda7a ChangeLog 9431
+MISC ChangeLog 9697 RMD160 6ca140c6f85af0e474383e65610268636e8e9203 SHA1 7b4cf6f3ade872897b4013ebcc19969eff7df3da SHA256 e71c0e51fced12041378391b34a50065b8dae60578c174437a2283c52a6f90f5
+MD5 ccc2b8d5bb27a32393b2c8319e3604da ChangeLog 9697
+RMD160 6ca140c6f85af0e474383e65610268636e8e9203 ChangeLog 9697
+SHA256 e71c0e51fced12041378391b34a50065b8dae60578c174437a2283c52a6f90f5 ChangeLog 9697
 MISC metadata.xml 440 RMD160 303266342eda535b9947139b2ff53c00228d9ccf SHA1 f294fb6ef478508f521240bb9d6492f5341e9193 SHA256 036d6305ad38764d6c362c74949cc7241fbc685220c34409fc4a793ff93f214f
 MD5 34cdf713d981b1ce7015fddcfa1edcd3 metadata.xml 440
 RMD160 303266342eda535b9947139b2ff53c00228d9ccf metadata.xml 440
@@ -65,6 +76,9 @@ SHA256 41a61c33279327f07fa6dc9c52864bae243a05f32bbce94798eeaa5bb1a5c9f3 files/di
 MD5 31fa81d60f7ad13fe142eced33462842 files/digest-lilypond-2.10.25 253
 RMD160 7206cbe77f94b5ce7da9e9e7d999797b81fde830 files/digest-lilypond-2.10.25 253
 SHA256 97a3406c56c99a02470aae4fc3a92fb4ede2e0d4206940d0b8707b423a4f8f0d files/digest-lilypond-2.10.25 253
+MD5 31fa81d60f7ad13fe142eced33462842 files/digest-lilypond-2.10.25-r1 253
+RMD160 7206cbe77f94b5ce7da9e9e7d999797b81fde830 files/digest-lilypond-2.10.25-r1 253
+SHA256 97a3406c56c99a02470aae4fc3a92fb4ede2e0d4206940d0b8707b423a4f8f0d files/digest-lilypond-2.10.25-r1 253
 MD5 9279ec8a69f1eb8be5cb4520744a7b56 files/digest-lilypond-2.11.23 253
 RMD160 23f00e17206fb131606b468ec1872ad95366aaf4 files/digest-lilypond-2.11.23 253
 SHA256 410f6b6a4fc17b742210de6d76fe86d526125f0a3708cdea85b89578a9d7bc74 files/digest-lilypond-2.11.23 253
@@ -83,3 +97,10 @@ SHA256 f286b47ee3eca311b4e1a44f493084835c212274e4c03a7f2171c83c296e50a5 files/di
 MD5 a0fdbded6e8885f4420394065b04ded4 files/digest-lilypond-2.8.0-r1 548
 RMD160 05d7b40c3401a9406cd582b11f9b73fe19b1f259 files/digest-lilypond-2.8.0-r1 548
 SHA256 b816c1638e7d39363f3be6dcf0d74ad81b06024b23f2a76ff67e8d0a2274c7d8 files/digest-lilypond-2.8.0-r1 548
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGYBblOeoy/oIi7uwRAksqAJwPojB3mZMDX7qwosUdH68IbxihDwCfdjmk
+8I6kvWdAMGMn2vZxzePZAYg=
+=rNue
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/files/50lilypond-gentoo.el b/media-sound/lilypond/files/50lilypond-gentoo.el
new file mode 100644
index 000000000000..50f62c44d28d
--- /dev/null
+++ b/media-sound/lilypond/files/50lilypond-gentoo.el
@@ -0,0 +1,7 @@
+
+;;; lilypond site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'LilyPond-mode "lilypond-mode" "LilyPond Editing Mode" t)
+(add-to-list 'auto-mode-alist '("\\.i?ly\\'" . LilyPond-mode))
+(add-hook 'LilyPond-mode-hook 'turn-on-font-lock)
diff --git a/media-sound/lilypond/files/digest-lilypond-2.10.25-r1 b/media-sound/lilypond/files/digest-lilypond-2.10.25-r1
new file mode 100644
index 000000000000..5db91d2a7546
--- /dev/null
+++ b/media-sound/lilypond/files/digest-lilypond-2.10.25-r1
@@ -0,0 +1,3 @@
+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/lilypond-2.10.25-r1.ebuild b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
new file mode 100644
index 000000000000..df0e60f13b3d
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
@@ -0,0 +1,121 @@
+# 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.1 2007/06/01 12:53:52 ulm Exp $
+
+inherit eutils autotools 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
+
+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 =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} || 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
+}