old

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

9 files changed, 9 insertions, 451 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 54641f5672ff..1a26b80a7bc2 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.114 2012/03/12 23:56:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.115 2012/03/13 09:29:19 ssuominen Exp $
+
+  13 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -lilypond-2.12.2.ebuild,
+  -lilypond-2.12.2-r1.ebuild, -files/lilypond-2.12.2-dont-install-pyc.patch,
+  -files/lilypond-2.12.2-glibc-2.10.patch, -lilypond-2.12.3.ebuild,
+  -files/lilypond-2.12.3-gcc45.patch,
+  -files/lilypond-2.12.3-python-cflags.patch,
+  -files/lilypond-2.12.3-qa_pyc_fix.patch:
+  old
 
   12 Mar 2012; Tim Harder <radhermit@gentoo.org> lilypond-2.14.2.ebuild:
   Remove unnecessary python convert shebangs line.
diff --git a/media-sound/lilypond/files/lilypond-2.12.2-dont-install-pyc.patch b/media-sound/lilypond/files/lilypond-2.12.2-dont-install-pyc.patch
deleted file mode 100644
index 43b7ffa98985..000000000000
--- a/media-sound/lilypond/files/lilypond-2.12.2-dont-install-pyc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lilypond-2.12.2.orig/python/GNUmakefile	2009-01-18 22:04:57.000000000 -0200
-+++ lilypond-2.12.2/python/GNUmakefile	2009-12-10 12:28:27.000000000 -0300
-@@ -16,7 +16,7 @@
- INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
- 
- INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
--INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
-+INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES)
- 
- $(outdir)/midi.lo: $(outdir)/config.hh
- 
diff --git a/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch b/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch
deleted file mode 100644
index d1e34087881d..000000000000
--- a/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naurp lilypond-2.12.2-orig/lily/relocate.cc lilypond-2.12.2/lily/relocate.cc
---- lilypond-2.12.2-orig/lily/relocate.cc	2009-01-18 18:04:57.000000000 -0600
-+++ lilypond-2.12.2/lily/relocate.cc	2009-07-29 14:31:12.908541341 -0600
-@@ -276,13 +276,13 @@ expand_environment_variables (string ori
-   string out;
-   while (ptr < start_ptr + len)
-     {
--      char *dollar = strchr (ptr, '$');
-+      const char *dollar = strchr (ptr, '$');
-       
-       if (dollar != NULL)
- 	{
--	  char *start_var = dollar + 1;
--	  char *end_var = start_var;
--	  char *start_next = end_var;
-+	  const char *start_var = dollar + 1;
-+	  const char *end_var = start_var;
-+	  const char *start_next = end_var;
- 	  
- 	  out += string (ptr, dollar - ptr);
- 	  ptr = dollar;
diff --git a/media-sound/lilypond/files/lilypond-2.12.3-gcc45.patch b/media-sound/lilypond/files/lilypond-2.12.3-gcc45.patch
deleted file mode 100644
index bd1886c0b563..000000000000
--- a/media-sound/lilypond/files/lilypond-2.12.3-gcc45.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fixing build with gcc-4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=317163
-
-Following patch was applied in 2.13 branch
-Thanks Patrick McCarty for information
-
---- lily/spacing-spanner.cc
-+++ lily/spacing-spanner.cc
-@@ -38,8 +38,8 @@
-   vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
- 			     &Paper_column::less_than);  
-   
--  all = vector<Grob*>::vector<Grob*> (all.begin () + start,
--				      all.begin () + end + 1);
-+  all = vector<Grob*> (all.begin () + start,
-+		       all.begin () + end + 1);
-   return all;
- }
- 
diff --git a/media-sound/lilypond/files/lilypond-2.12.3-python-cflags.patch b/media-sound/lilypond/files/lilypond-2.12.3-python-cflags.patch
deleted file mode 100644
index 869a6f3c234c..000000000000
--- a/media-sound/lilypond/files/lilypond-2.12.3-python-cflags.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN lilypond-2.12.3~/aclocal.m4 lilypond-2.12.3/aclocal.m4
---- lilypond-2.12.3~/aclocal.m4	2010-01-12 18:20:49.000000000 +0200
-+++ lilypond-2.12.3/aclocal.m4	2010-06-28 18:31:01.000000000 +0300
-@@ -985,7 +985,7 @@
-     if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
-         # Clean out junk: http://bugs.python.org/issue3290
- 	# Python headers may need some -f* flags, leave them in.
--	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\)\+//g'`
-+	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\|\.\)\+//g'`
- 	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-     fi
-     
-diff -ruN lilypond-2.12.3~/stepmake/aclocal.m4 lilypond-2.12.3/stepmake/aclocal.m4
---- lilypond-2.12.3~/stepmake/aclocal.m4	2010-01-12 18:20:49.000000000 +0200
-+++ lilypond-2.12.3/stepmake/aclocal.m4	2010-06-28 18:31:01.000000000 +0300
-@@ -985,7 +985,7 @@
-     if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
-         # Clean out junk: http://bugs.python.org/issue3290
- 	# Python headers may need some -f* flags, leave them in.
--	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\)\+//g'`
-+	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\|\.\)\+//g'`
- 	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-     fi
-     
diff --git a/media-sound/lilypond/files/lilypond-2.12.3-qa_pyc_fix.patch b/media-sound/lilypond/files/lilypond-2.12.3-qa_pyc_fix.patch
deleted file mode 100644
index 3ac3c305d3aa..000000000000
--- a/media-sound/lilypond/files/lilypond-2.12.3-qa_pyc_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur lilypond-2.12.2.orig/python/GNUmakefile lilypond-2.12.2/python/GNUmakefile
---- lilypond-2.12.2.orig/python/GNUmakefile	2009-01-18 22:04:57.000000000 -0200
-+++ lilypond-2.12.2/python/GNUmakefile	2009-12-10 12:28:27.000000000 -0300
-@@ -16,7 +16,7 @@
- INSTALLATION_OUT_DIR=$(local_lilypond_libdir)/python
- 
- INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
--INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
-+INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES)
- 
- $(outdir)/midi.lo: $(outdir)/config.hh
- 
diff --git a/media-sound/lilypond/lilypond-2.12.2-r1.ebuild b/media-sound/lilypond/lilypond-2.12.2-r1.ebuild
deleted file mode 100644
index 97c6c839601f..000000000000
--- a/media-sound/lilypond/lilypond-2.12.2-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.2-r1.ebuild,v 1.2 2011/10/08 18:51:54 armin76 Exp $
-
-inherit eutils versionator toolchain-funcs elisp-common
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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"
-
-#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.2
-	>=dev-lang/python-2.4
-	|| ( >=app-text/ghostscript-gnu-8.15
-		 >=app-text/ghostscript-gpl-8.15 )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	>=media-gfx/fontforge-20070501
-	dev-texlive/texlive-metapost
-	app-text/t1utils
-	>=app-text/mftrace-1.2.9
-	>=sys-apps/texinfo-4.11
-	sys-devel/make
-	sys-devel/gettext
-	sys-devel/flex
-	dev-lang/perl
-	>=sys-devel/bison-2.0"
-#	doc? ( media-libs/netpbm
-#		   media-gfx/imagemagick
-#          app-text/texi2html )"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	epatch "${FILESDIR}"/${P}-dont-install-pyc.patch
-}
-
-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
-
-	# see bug 228823
-	econf --with-ncsb-dir=/usr/share/fonts/default/ghostscript \
-		$(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, bug 236010
-	emake -j1 || die "emake failed"
-#	emake || die "emake failed"
-
-# -j is unsupported, but CPU_COUNT may be set instead
-#	if use doc; then
-#		emake -j1 CPU_COUNT=2 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 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.12.2.ebuild b/media-sound/lilypond/lilypond-2.12.2.ebuild
deleted file mode 100644
index 03ee5b7723bf..000000000000
--- a/media-sound/lilypond/lilypond-2.12.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.2.ebuild,v 1.7 2011/10/08 18:51:54 armin76 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 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"
-
-#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.2
-	>=dev-lang/python-2.4
-	|| ( >=app-text/ghostscript-gnu-8.15
-		 >=app-text/ghostscript-gpl-8.15 )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	>=media-gfx/fontforge-20070501
-	dev-texlive/texlive-metapost
-	app-text/t1utils
-	>=app-text/mftrace-1.2.9
-	>=sys-apps/texinfo-4.11
-	sys-devel/make
-	sys-devel/gettext
-	sys-devel/flex
-	dev-lang/perl
-	>=sys-devel/bison-2.0"
-#	doc? ( media-libs/netpbm
-#		   media-gfx/imagemagick
-#          app-text/texi2html )"
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-}
-
-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
-
-	# see bug 228823
-	econf --with-ncsb-dir=/usr/share/fonts/default/ghostscript \
-		$(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, bug 236010
-	emake -j1 || die "emake failed"
-#	emake || die "emake failed"
-
-# -j is unsupported, but CPU_COUNT may be set instead
-#	if use doc; then
-#		emake -j1 CPU_COUNT=2 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 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.12.3.ebuild b/media-sound/lilypond/lilypond-2.12.3.ebuild
deleted file mode 100644
index f5d739c487ec..000000000000
--- a/media-sound/lilypond/lilypond-2.12.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.9 2011/10/08 18:51:54 armin76 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-
-inherit eutils versionator toolchain-funcs elisp-common flag-o-matic python autotools
-
-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 ~hppa x86"
-
-IUSE="debug emacs profile"
-
-RDEPEND="media-fonts/urw-fonts
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	>=x11-libs/pango-1.12.3
-	>=dev-scheme/guile-1.8.2[deprecated,regex]
-	|| ( >=app-text/ghostscript-gnu-8.15
-		 >=app-text/ghostscript-gpl-8.15 )
-	emacs? ( virtual/emacs )"
-
-DEPEND="${RDEPEND}
-	>=media-gfx/fontforge-20070501
-	dev-texlive/texlive-metapost
-	app-text/t1utils
-	>=app-text/mftrace-1.2.9
-	>=sys-apps/texinfo-4.11
-	sys-devel/make
-	sys-devel/gettext
-	sys-devel/flex
-	dev-lang/perl
-	>=sys-devel/bison-2.0"
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qa_pyc_fix.patch"
-	epatch "${FILESDIR}/${P}-python-cflags.patch"
-	epatch "${FILESDIR}/${P}-gcc45.patch"
-	eautoreconf
-}
-
-src_configure() {
-	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
-
-	if use profile; then
-		einfo "Stripping -fomit-frame-pointer flag"
-		strip-flags -fomit-frame-pointer
-	fi
-
-	econf $(use_enable debug debugging) \
-		$(use_enable profile profiling) \
-		--disable-gui \
-		--disable-documentation
-}
-
-src_compile() {
-	# without -j1 it will not fail, but building docs later will, bug 236010
-	emake -j1 || die "emake failed"
-
-	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"
-
-	# remove elisp files since they are in the wrong directory
-	rm -rf "${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 HACKING NEWS.txt README.txt || die
-
-	python_convert_shebangs -r 2 "${D}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}