Version bumps, update metapost symlink if necessary.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 283 insertions, 12 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 968a5e5d6640..e329cd9075a5 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.177 2014/02/18 03:59:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.178 2014/04/03 08:32:39 radhermit Exp $
+
+*lilypond-2.19.3 (03 Apr 2014)
+*lilypond-2.18.2 (03 Apr 2014)
+
+  03 Apr 2014; Tim Harder <radhermit@gentoo.org> +lilypond-2.18.2.ebuild,
+  +lilypond-2.19.3.ebuild, lilypond-9999.ebuild:
+  Version bumps, update metapost symlink if necessary.
 
 *lilypond-2.18.1 (18 Feb 2014)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 628cc1cbf54f..122ba978f4da 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -7,22 +7,26 @@ AUX lilypond-2.17.2-tex-docs.patch 608 SHA256 ca43b5633f3ee85748d5f0f43814b144ec
 DIST lilypond-2.16.2.tar.gz 16062982 SHA256 1f4326cf8f9363076a83ce3cbe35f747188084f7492000ed3a7ccc3ce60aa1cb SHA512 3ead74ddb7e51be274aa5aa607b776261ae5d0e9863ebe745451875e62a60fac2376f7e80546df66010cdec2752c271e7006275608f30ce9a2d1b88f22dc1d8d WHIRLPOOL a25539dac5e508220e1ddeeaed261b730e76fd26c5dbc0f97683b65bcbc5907ef6bfbe8c16a7f6a15d12950d4a7d547ee1716e25cdfb5b750e235c913a8ef38e
 DIST lilypond-2.18.0.tar.gz 16013863 SHA256 89059139a560a4900305b52d9327969cfcdedb061ed7bae310fdf5d4ba2aa230 SHA512 17d758688ac0c7f9e654e0157cd55ec9e9310d70392109c1edd666c1dc33e1ac9682eb1c18e678d018181c7d7dc916a62c6cc49e3c66c5c940bd2634e0d2e3bb WHIRLPOOL 2db89015daa41fcee21f435bf3e9d86edcb9c52e278ab482be7ba3cd5a046b65be312e1c9702ee16080045b70ac3fa1757965a7586384af0485f4b3a43486a30
 DIST lilypond-2.18.1.tar.gz 16017579 SHA256 4c0d4df2ae715d74e6250beb81db3048f94b10704f54c6168185f8eed03e8b40 SHA512 97e154d32f87a4c67270d89e54b7a6ed3baaf59a7684023fb9f2a6d254da19a6df55f92ed3a6942eea498a709599758eb7c0ca932d1ebcb0f92073001d1a30b1 WHIRLPOOL 73cb2c167d251759696247ff874c0ad71a48f5266b6f9761e2969ae4c0259dfaa72e6008f4f502695588899aa21fb79881ef97c0d7c82d4fb1314b8938c0ca7e
+DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
 DIST lilypond-2.19.2.tar.gz 16025529 SHA256 d68761b0af3ae48f69cb69235b9ef605027cc64a84c570f8c88f1512538e55b1 SHA512 1e2b21b33ce7445ad5a2967e0d92e9f56128e7e3aaf73e909bcc4431fe1fb58fd106f1efca4efc54923835732abf7876c277b7448b01ce9113e0a13792902744 WHIRLPOOL bb7c6e17f4ba14b1c63dc2d59a6c298c55ca0cc57b1dc4bd429453f194f4247f58476c75032b637e0c4a7de11722d47f00481f9020a1a35d448edceb00416e8e
+DIST lilypond-2.19.3.tar.gz 16035346 SHA256 08efddcd3b24675870c6891932205361a2f9d839c49760798d48d6df7b36053e SHA512 00685c5b9c2abd73e8fe3000b9ed59606ead5139a9509dfe575d1ec181397fd18894641830e85aee29e110fb336fd4d1691cbb0bcf3a1dbc6d671493326713ff WHIRLPOOL bc9ab05146630684555bef21d3dee820b92b970f8f206b6ac53cdb77e414afa6ba45f8316ce14d9629c26e50bc9ee111c4c1e3978dab89ee6c416fb74c145f71
 EBUILD lilypond-2.16.2.ebuild 2560 SHA256 2e8712a0e9255175019eccbe036b9d59b66adffb2dac72e449208342d5b76928 SHA512 ab5adb4f15cfb188ea50ef2bb9c2b04de5591e143e5787ec0f2f74268008c67a4dc4b3afcb4435df3fb033b5635fa37a1e55c234234dabaf65ba30dbfd93c176 WHIRLPOOL d1096e66c7cc0d154edfc82bccb1393aaae42dc0257317ba99b5d50ab03babf5e4ec1ec6574b136b78bcf138e4e12b5299cd7ac3995062c7bde3b026b5620c1f
 EBUILD lilypond-2.18.0-r1.ebuild 2750 SHA256 b1e2a3b6be81ea530f9548a7b21b58819bb44c3455be7fa3d0f7b1136451c1f8 SHA512 5d57e9da96fbcf961b13b928dfe7d8ba24578dd5db351b9e6968518b64103abf4e5a0fc0ba96f47a2c63aa9cd42cd5cc0e1f908c6a98b63e1f17e3893fa491c0 WHIRLPOOL 18044f3c4a42dac83fb0874f688684902e042fb54e9ac75064c8ac289bd85c9ff49fee271ab2b7d5af61d767bed618eb85d3abbcc6448f4607f2d1a25866c018
 EBUILD lilypond-2.18.1.ebuild 2747 SHA256 0a6f79c21ba72df67c1e947908ca6dd426cfd9ec65c64181600cd323a08868d1 SHA512 4708e2b791561c68ff06f276b314489a9dd5906c92abd4b004bf2af5070d9b97bf88d430df32ebd835e4c9b0a808dca803d3333721d6552e4cc63da4d88c7b0a WHIRLPOOL bbc6980185f657b00a8359e239652a7901413f253cab106814d64846dc85f63436d4e19d48a5e3dc17675471cc9d732f0adaf6dce4d2c5278643c12b679a5ae1
+EBUILD lilypond-2.18.2.ebuild 3099 SHA256 38603af45a26486392db55aa2e67b67a0794405c90f9c9bd0f07cfdb4b81193d SHA512 671043f2e3004d15b7d069148403176129e4fbd3d8aeb855bf1a20fab6dc1b2e2e825a171727eb50c686146b7155978b5f239213064f26f462fccf3af0edf021 WHIRLPOOL 7b6a176a68c3678f419beeb7561d7a067939706e81dff1b61705739f561bd48e7f7e95c0a8c03c263595cc3cea052e90b414c4483080c06d3134a96cb355bf1a
 EBUILD lilypond-2.19.2.ebuild 2747 SHA256 6f2fda990012f8b17287ba8a217b8b23ffc1e51a81226169b3049cc575b26264 SHA512 e879ee1d340570b2d7c93c9274ea8d05bab144104652278ad44858a0c694621b877176980a6599e34a8dc35371fd0ea22c0da28dcb08c39e8eb83865efdf3947 WHIRLPOOL 82e83cb12b0cbe9e6c2c965a617ac8b1fe7069572ea7d9d6aa3b544fbb0ae918e8aa98b5b2a8606828f128c428adddb203a5024af7f719d3d74eb206f9b3fda4
-EBUILD lilypond-9999.ebuild 2620 SHA256 1205d39ecc5da4660b73054cc848e8221f18ed0a00e4b54272902969f69d0cd2 SHA512 0a98731a90aee219c3e648ff8e8ff207d3330bf31b8e2e530b94ee6186e2ce7631316043c201da4c92281e76d2e2677493c4324767413b1b1f24d9d18a0387d5 WHIRLPOOL a62e4db13f7130bd37f34594660b20668b2f41f65c29a71e1aa38a1af31964a424a492cb5b99aecb60bbe8a36debac62e267de54ef1dc8d5ab5f2b5c5efc02cc
-MISC ChangeLog 27995 SHA256 9ada640c6ada95cdb12f1944157448da918c8a1e0c6841df2cadd0012287d3b4 SHA512 76920cc1dc6b4c52df31189e95657544dc300b9cff4ee2627f767909f5072ae0bf074b368e35b1e3ccf5e2f239416d372c6ad761581d3a265385d8bdd07e3879 WHIRLPOOL 68c2bb7993a9ae752356bbdf82124f3cd1793a816b4dd18808b32be5c30c1429bb9902483e89baa440e7d393b1f0f861b9519397badc9c8235ea2d928c28d58c
+EBUILD lilypond-2.19.3.ebuild 3099 SHA256 3812ef7cbc7049f160708e684721a8fb543a3f63188515e0892509a404f9ccd5 SHA512 caaae4f7e017653e645ca481a26fddc394df8dba888fefb7dc6d2b5721a2cbdb6d25879798be3f114baa53bfeeb77da4f1fd47bd7c625defb9a17561d2c0a369 WHIRLPOOL 59cdf12772d6134f0a849e0b5cdd086dd23d2ab28df9589491641f0499f0d0359ff598aa298774c53bc832d3a1d7dd42ad638576fb8265fcbd22b508f47313f7
+EBUILD lilypond-9999.ebuild 2973 SHA256 cf345bee1a11770240b1134cddc19bc9013fd3653e485034112fdd10dda92ba7 SHA512 d457399d64596a2171a0b68fd74d231e59467c4e0feb799e4da75985184fff4fac93127af6dbcd4273d041821728e7d8462643031322cfb43c11addbec9f5626 WHIRLPOOL e771c3caf7c8b5b19ef8e1fd986d011a4bbb0109cdf3bc552d51c10735fde64b04553cb7621c6ab1de25febcd20479ce0be433e465425fe55db567c053094b07
+MISC ChangeLog 28237 SHA256 f7710b751e37f7b0737e218e1b98b70345edc478bc195fffddb010b5c00b1cd4 SHA512 be67d7d7716973e5adc4f0f893057d8a50c06332e362fbabc5064b10a93b3a2f76ed011e14011e6015f4a487be8534b349058e195823fcf4db440c3bc86ecc10 WHIRLPOOL cd7aecbada2bcbf012149641064bf1fc8034059e4d51dcf968fd8dc2c9eb8a11bd9f0db85126cf3f7a1d33bcad8095ed2da39c8e7583599dbd2a723a725a470e
 MISC metadata.xml 534 SHA256 9d9d5dba892fde9a346843a9cacaeac7ce9236f643d1c0f778333cc65181a025 SHA512 711b4d7ff31d686c01cc9f67bbd84bd69da5a955e60a759b814a9379d20079061d019a53da9906a75a4a408654307406eef99129655fb38a21953eaf209215e1 WHIRLPOOL 87cddb2db014ae47a3e2408fb696fcce7118632a8574d0b8be21ef603d3ecdc4714f2736a7a3388fc907e6b2b984feabca1f77b603e34ff1477920260cb696b4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTAtqKAAoJEEqz6FtPBkyjGlEIAKn7QmEexO6zlZFvaxFZs88h
-cy2lGQYCjLMrVbpF0YPlleWJMW0JuM37CDUE5kDRh17e2zhsKn7MfbEZ+M/8Isio
-DeY1h4qM5/yYuPmKwc6MPll2fsPoJoxcoNoPhW7RzrY0P4uENiUyjUziums5ac2y
-dOuiVFl9wE+EfCx1q0LH4ed5ig7T7vc6c/8p1IM/m3J0sI45Neox8ZeDVw77iexm
-wglq0YzknPTKpoQkaSAnrdp6iE6c62bkj6QmjnmtWvGzhVvMYcNJBXdNN5KBqUSR
-UatzBSxkvBzWnMNLyHTmpgIf2x6Z1pIuKBz9l58fVaAC17XfzuzQNm0QrlSya3g=
-=mTR6
+iQEcBAEBCAAGBQJTPRyrAAoJEEqz6FtPBkyjQu4H/323Lcdhi+FUpIM+AWZHTyRc
+VPAdxIxGtTtiiZWEmCvoJBadqjkfNVq8yYWXZkOc/SNQgzAC04a9Vm4cWX5KW62N
+lL3XQv/ajIXMkO0VynAo7j+mqzaxbJkpI90w9goFVcjU0imssdYJ9qqYWvzddd/T
+RxaMGhf11+8/4MSPkL/A9J9NLuzAbo2LMtR9hU9JzGg4/mMISulwTv4i04RUJrqF
+10wg+vsDEKlXmMLkJUSFEZw2zP0JMWi3mZ/3cTmfk4kcXm1Rfvt/pIaTh4Ecv823
+2jf5RRgBaWI13wbfukTGZsuPmk6stbATR96OaTgIQrmGiUpsW5DyXoFv2MlLCgA=
+=X8gO
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/lilypond-2.18.2.ebuild b/media-sound/lilypond/lilypond-2.18.2.ebuild
new file mode 100644
index 000000000000..4dd0da2e04ab
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.18.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.18.2.ebuild,v 1.1 2014/04/03 08:32:39 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2[deprecated,regex]
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	|| (
+		( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	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
+
+	python_fix_shebang "${ED}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-2.19.3.ebuild b/media-sound/lilypond/lilypond-2.19.3.ebuild
new file mode 100644
index 000000000000..8608f0cc460b
--- /dev/null
+++ b/media-sound/lilypond/lilypond-2.19.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.19.3.ebuild,v 1.1 2014/04/03 08:32:39 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit elisp-common autotools eutils python-single-r1
+
+DESCRIPTION="GNU Music Typesetter"
+SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+HOMEPAGE="http://lilypond.org/"
+
+LICENSE="GPL-3 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+LANGS=" ca cs da de el eo es fi fr it ja nl ru sv tr uk vi zh_TW"
+IUSE="debug emacs profile vim-syntax ${LANGS// / linguas_}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.15
+	>=dev-scheme/guile-1.8.2[deprecated,regex]
+	media-fonts/urw-fonts
+	media-libs/fontconfig
+	media-libs/freetype:2
+	>=x11-libs/pango-1.12.3
+	emacs? ( virtual/emacs )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-text/t1utils
+	dev-lang/perl
+	|| (
+		( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
+		<dev-texlive/texlive-metapost-2013
+	)
+	virtual/pkgconfig
+	media-gfx/fontforge
+	>=sys-apps/texinfo-4.11
+	>=sys-devel/bison-2.0
+	sys-devel/flex
+	sys-devel/gettext
+	sys-devel/make"
+
+# Correct output data for tests isn't bundled with releases
+RESTRICT="test"
+
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+
+	if ! use vim-syntax ; then
+		sed -i 's/vim//' GNUmakefile.in || die
+	fi
+
+	# respect CFLAGS
+	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
+
+	for lang in ${LANGS}; do
+		use linguas_${lang} || rm po/${lang}.po || die
+	done
+
+	# respect AR
+	sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# documentation generation currently not supported since it requires a newer
+	# version of texi2html than is currently in the tree
+
+	econf \
+		--with-ncsb-dir=/usr/share/fonts/urw-fonts \
+		--disable-documentation \
+		--disable-optimising \
+		--disable-pipe \
+		$(use_enable debug debugging) \
+		$(use_enable profile profiling)
+}
+
+src_compile() {
+	default
+
+	if use emacs ; then
+		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
+			|| die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
+
+	# remove elisp files since they are in the wrong directory
+	rm -r "${ED}"/usr/share/emacs || die
+
+	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
+
+	python_fix_shebang "${ED}"
+
+	dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 1d09effd4c9b..2326087d9b25 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v 1.6 2014/02/04 07:31:03 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-9999.ebuild,v 1.7 2014/04/03 08:32:39 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit elisp-common autotools eutils git-2 python-single-r1
+inherit elisp-common autotools eutils git-r3 python-single-r1
 
 EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
 
@@ -44,6 +44,18 @@ DEPEND="${RDEPEND}
 # Correct output data for tests isn't bundled with releases
 RESTRICT="test"
 
+pkg_setup() {
+	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
+	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
+		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
+			einfo "Updating metapost symlink"
+			eselect mpost update || die
+		fi
+	fi
+
+	python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	if ! use vim-syntax ; then
 		sed -i 's/vim//' GNUmakefile.in || die