radhermit    14/09/07 07:11:13

  Modified:             ChangeLog lilypond-2.16.2.ebuild
                        lilypond-2.18.2.ebuild
  Added:                lilypond-2.19.13.ebuild
  Log:
  Version bump. Remove bundled texinfo file to fix sandbox issue (bug #448560).
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
4F064CA3)

Revision  Changes    Path
1.186                media-sound/lilypond/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/ChangeLog?rev=1.186&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/ChangeLog?rev=1.186&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/ChangeLog?r1=1.185&r2=1.186

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- ChangeLog   19 Jul 2014 04:36:35 -0000      1.185
+++ ChangeLog   7 Sep 2014 07:11:13 -0000       1.186
@@ -1,6 +1,12 @@
 # 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.185 
2014/07/19 04:36:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.186 
2014/09/07 07:11:13 radhermit Exp $
+
+*lilypond-2.19.13 (07 Sep 2014)
+
+  07 Sep 2014; Tim Harder <[email protected]> lilypond-2.16.2.ebuild,
+  lilypond-2.18.2.ebuild, +lilypond-2.19.13.ebuild:
+  Version bump. Remove bundled texinfo file to fix sandbox issue (bug #448560).
 
 *lilypond-2.19.10 (19 Jul 2014)
 



1.6                  media-sound/lilypond/lilypond-2.16.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild?rev=1.6&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild?rev=1.6&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild?r1=1.5&r2=1.6

Index: lilypond-2.16.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- lilypond-2.16.2.ebuild      5 Sep 2013 18:57:17 -0000       1.5
+++ lilypond-2.16.2.ebuild      7 Sep 2014 07:11:13 -0000       1.6
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.16.2.ebuild,v 1.5 
2013/09/05 18:57:17 mgorny Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.16.2.ebuild,v 1.6 
2014/09/07 07:11:13 radhermit Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -54,6 +54,9 @@
                use linguas_${lang} || rm po/${lang}.po || die
        done
 
+       # remove bundled texinfo file (fixes bug #448560)
+       rm tex/texinfo.tex || die
+
        eautoreconf
 }
 



1.2                  media-sound/lilypond/lilypond-2.18.2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.18.2.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.18.2.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.18.2.ebuild?r1=1.1&r2=1.2

Index: lilypond-2.18.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.18.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lilypond-2.18.2.ebuild      3 Apr 2014 08:32:39 -0000       1.1
+++ lilypond-2.18.2.ebuild      7 Sep 2014 07:11:13 -0000       1.2
@@ -1,9 +1,9 @@
 # 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 $
+# $Header: 
/var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.18.2.ebuild,v 1.2 
2014/09/07 07:11:13 radhermit Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit elisp-common autotools eutils python-single-r1
 
@@ -73,6 +73,9 @@
        # respect AR
        sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make 
|| die
 
+       # remove bundled texinfo file (fixes bug #448560)
+       rm tex/texinfo.tex || die
+
        eautoreconf
 }
 



1.1                  media-sound/lilypond/lilypond-2.19.13.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.19.13.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/lilypond/lilypond-2.19.13.ebuild?rev=1.1&content-type=text/plain

Index: lilypond-2.19.13.ebuild
===================================================================
# 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.13.ebuild,v 1.1 
2014/09/07 07:11:13 radhermit Exp $

EAPI=5
PYTHON_COMPAT=( python2_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

        # remove bundled texinfo file (fixes bug #448560)
        rm tex/texinfo.tex || 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

        dodoc AUTHORS.txt HACKING NEWS.txt README.txt
}

pkg_postinst() {
        use emacs && elisp-site-regen
}

pkg_postrm() {
        use emacs && elisp-site-regen
}




Reply via email to