From: "Patrice Clement" <monsieurp@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/
Date: Sun, 12 Jun 2016 22:00:41 +0000 (UTC) [thread overview]
Message-ID: <1465767165.f7824d6e3a2dd6874157d9fc4f008987d49aa89f.monsieurp@gentoo> (raw)
commit: f7824d6e3a2dd6874157d9fc4f008987d49aa89f
Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com>
AuthorDate: Sat May 28 17:08:34 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Jun 12 21:32:45 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7824d6e
media-sound/lilypond: Various updates.
* Fix metapost deps in 2.18.2-r1, wrt bug 525712.
* Do not install HACKING in 2.18.2-r1 because it is irrelevant.
* EAPI 6 for version 2.18.2 and revbump to -r2.
* Sync live ebuild with version 2.18.2-r2.
* Make -9999 version a "conditional live ebuild".
* Version bump to 2.19.42.
* Drop 2.19.15.
Package-Manager: portage-2.3.0_rc1
Gentoo-Bug: https://bugs.gentoo.org/525712
Closes: https://github.com/gentoo/gentoo/pull/1552
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
media-sound/lilypond/Manifest | 2 +-
media-sound/lilypond/lilypond-2.18.2-r1.ebuild | 8 ++++--
...nd-2.19.15.ebuild => lilypond-2.18.2-r2.ebuild} | 31 ++++++++++++++------
...nd-2.18.2-r1.ebuild => lilypond-2.19.42.ebuild} | 33 +++++++++++++---------
media-sound/lilypond/lilypond-9999.ebuild | 30 ++++++++++++++------
5 files changed, 69 insertions(+), 35 deletions(-)
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 44c4319..dd9b0f9 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,2 +1,2 @@
DIST lilypond-2.18.2.tar.gz 16027977 SHA256 329d733765b0ba7be1878ae3f457dbbb875cc2840d2b75af4afc48c9454fba07 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6 WHIRLPOOL 95db264992a1e425fd1ee53d980941eef554c1784a1adfc105750d82d11664f61207c2b1897b6e99448790131c0715f08401f45b663c420553925596c6fd4b1c
-DIST lilypond-2.19.15.tar.gz 16351341 SHA256 bc48d2cf23cfabf79e8b7fdfcb46b7e8c04ba63c3b076b5bca2bbb3a86a07da9 SHA512 a2004086ebd9f4d6fa5d38910a605a3fa7ce76e126f6be6e0c9cdc6a7443f47a435e5dfac1cf54c1eb5113b5c3909a57943c7f6e84c31b7bf7f4cb7c5bfa71c7 WHIRLPOOL 2e7610e7a21a6ce1f042789c2f30aad2ea626971b816ebb18aa45471cdebde7f53fb0e94f5d0d20e1d950efd125c50f76621e3fbc8f260d1cabfa2ee59e37e3e
+DIST lilypond-2.19.42.tar.gz 16870150 SHA256 f925284e994a67712c9d57437f2ff4329a987793e071d6944bdf32d762b81c8c SHA512 2f94656f20bae50797985657c0e557aca793044c8b9ae137ee6bbdee60cb4aa72cca0988d8ae19bf24cc4948d2ba73cb87ce9530a746daeb93632e0092ea5acf WHIRLPOOL 887f4fa188f999474ab3b3240dafb1130861b38768bfbae18dd2096488bfb645b189ab47563f5d6de0dee81279d6fe84f5d2c9af690db0c0e767cf26dfb1fa72
diff --git a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild b/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
index 109621a..6567168 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
@@ -29,9 +29,11 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
DEPEND="${RDEPEND}
app-text/t1utils
dev-lang/perl
+ dev-libs/kpathsea
+ >=dev-texlive/texlive-metapost-2013
|| (
- ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
- <dev-texlive/texlive-metapost-2013
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
)
virtual/pkgconfig
media-gfx/fontforge[png]
@@ -118,7 +120,7 @@ src_install () {
python_fix_shebang "${ED}"
- dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+ dodoc AUTHORS.txt NEWS.txt README.txt
}
pkg_postinst() {
diff --git a/media-sound/lilypond/lilypond-2.19.15.ebuild b/media-sound/lilypond/lilypond-2.18.2-r2.ebuild
similarity index 84%
rename from media-sound/lilypond/lilypond-2.19.15.ebuild
rename to media-sound/lilypond/lilypond-2.18.2-r2.ebuild
index b53f90c..e27ca36 100644
--- a/media-sound/lilypond/lilypond-2.19.15.ebuild
+++ b/media-sound/lilypond/lilypond-2.18.2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit elisp-common autotools eutils python-single-r1
+inherit elisp-common autotools python-single-r1
DESCRIPTION="GNU Music Typesetter"
SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
@@ -19,7 +19,7 @@ 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]
+ >=dev-scheme/guile-1.8.2:12[deprecated,regex]
media-fonts/urw-fonts
media-libs/fontconfig
media-libs/freetype:2
@@ -29,12 +29,14 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
DEPEND="${RDEPEND}
app-text/t1utils
dev-lang/perl
+ dev-libs/kpathsea
+ >=dev-texlive/texlive-metapost-2013
|| (
- ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
- <dev-texlive/texlive-metapost-2013
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
)
virtual/pkgconfig
- media-gfx/fontforge
+ media-gfx/fontforge[png]
>=sys-apps/texinfo-4.11
>=sys-devel/bison-2.0
sys-devel/flex
@@ -44,6 +46,13 @@ DEPEND="${RDEPEND}
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+ "${FILESDIR}"/${P}-fontforge.patch
+)
+
+DOCS=( AUTHORS.txt NEWS.txt README.txt )
+
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
@@ -57,7 +66,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
+ eapply "${PATCHES[@]}"
if ! use vim-syntax ; then
sed -i 's/vim//' GNUmakefile.in || die
@@ -76,6 +85,8 @@ src_prepare() {
# remove bundled texinfo file (fixes bug #448560)
rm tex/texinfo.tex || die
+ eapply_user
+
eautoreconf
}
@@ -113,7 +124,9 @@ src_install () {
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
fi
- dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+ python_fix_shebang "${ED}"
+
+ einstalldocs
}
pkg_postinst() {
diff --git a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild b/media-sound/lilypond/lilypond-2.19.42.ebuild
similarity index 83%
copy from media-sound/lilypond/lilypond-2.18.2-r1.ebuild
copy to media-sound/lilypond/lilypond-2.19.42.ebuild
index 109621a..f27ba36 100644
--- a/media-sound/lilypond/lilypond-2.18.2-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.42.ebuild
@@ -2,25 +2,31 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit elisp-common autotools eutils python-single-r1
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1
+
+if [[ "${PV}" = "9999" ]]; then
+ EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+ SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~hppa ~x86"
+fi
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="~alpha ~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:12[deprecated,regex]
- media-fonts/urw-fonts
+ media-fonts/tex-gyre
media-libs/fontconfig
media-libs/freetype:2
>=x11-libs/pango-1.12.3
@@ -29,9 +35,11 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
DEPEND="${RDEPEND}
app-text/t1utils
dev-lang/perl
+ dev-libs/kpathsea
+ >=dev-texlive/texlive-metapost-2013
|| (
- ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
- <dev-texlive/texlive-metapost-2013
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
)
virtual/pkgconfig
media-gfx/fontforge[png]
@@ -44,6 +52,8 @@ DEPEND="${RDEPEND}
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
+DOCS=( README.txt )
+
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
@@ -57,9 +67,6 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.17.2-tex-docs.patch
- epatch "${FILESDIR}"/${P}-fontforge.patch
-
if ! use vim-syntax ; then
sed -i 's/vim//' GNUmakefile.in || die
fi
@@ -77,7 +84,7 @@ src_prepare() {
# remove bundled texinfo file (fixes bug #448560)
rm tex/texinfo.tex || die
- epatch_user
+ eapply_user
eautoreconf
}
@@ -87,7 +94,7 @@ src_configure() {
# version of texi2html than is currently in the tree
econf \
- --with-ncsb-dir=/usr/share/fonts/urw-fonts \
+ --with-texgyre-dir=/usr/share/fonts/tex-gyre \
--disable-documentation \
--disable-optimising \
--disable-pipe \
@@ -118,7 +125,7 @@ src_install () {
python_fix_shebang "${ED}"
- dodoc AUTHORS.txt HACKING NEWS.txt README.txt
+ einstalldocs
}
pkg_postinst() {
diff --git a/media-sound/lilypond/lilypond-9999.ebuild b/media-sound/lilypond/lilypond-9999.ebuild
index 009d9e3..f27ba36 100644
--- a/media-sound/lilypond/lilypond-9999.ebuild
+++ b/media-sound/lilypond/lilypond-9999.ebuild
@@ -1,13 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit elisp-common autotools eutils git-r3 python-single-r1
+[[ "${PV}" = "9999" ]] && inherit git-r3
+inherit elisp-common autotools python-single-r1
-EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+if [[ "${PV}" = "9999" ]]; then
+ EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
+else
+ SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~hppa ~x86"
+fi
DESCRIPTION="GNU Music Typesetter"
HOMEPAGE="http://lilypond.org/"
@@ -19,7 +25,7 @@ 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]
+ >=dev-scheme/guile-1.8.2:12[deprecated,regex]
media-fonts/tex-gyre
media-libs/fontconfig
media-libs/freetype:2
@@ -29,12 +35,14 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
DEPEND="${RDEPEND}
app-text/t1utils
dev-lang/perl
+ dev-libs/kpathsea
+ >=dev-texlive/texlive-metapost-2013
|| (
- ( >=dev-texlive/texlive-metapost-2013 >=dev-tex/metapost-1.803 )
- <dev-texlive/texlive-metapost-2013
+ >=app-text/texlive-core-2013
+ >=dev-tex/metapost-1.803
)
virtual/pkgconfig
- media-gfx/fontforge
+ media-gfx/fontforge[png]
>=sys-apps/texinfo-4.11
>=sys-devel/bison-2.0
sys-devel/flex
@@ -44,6 +52,8 @@ DEPEND="${RDEPEND}
# Correct output data for tests isn't bundled with releases
RESTRICT="test"
+DOCS=( README.txt )
+
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
@@ -74,6 +84,8 @@ src_prepare() {
# remove bundled texinfo file (fixes bug #448560)
rm tex/texinfo.tex || die
+ eapply_user
+
eautoreconf
}
@@ -113,7 +125,7 @@ src_install () {
python_fix_shebang "${ED}"
- dodoc HACKING README.txt
+ einstalldocs
}
pkg_postinst() {
next reply other threads:[~2016-06-12 22:00 UTC|newest]
Thread overview: 109+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-12 22:00 Patrice Clement [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-19 14:10 [gentoo-commits] repo/gentoo:master commit in: media-sound/lilypond/ Sam James
2024-11-08 3:54 Sam James
2024-09-18 13:12 Arsen Arsenović
2024-08-11 20:56 Sam James
2024-06-23 11:28 Miroslav Šulc
2024-06-08 7:31 Miroslav Šulc
2024-06-08 7:24 Miroslav Šulc
2024-06-08 7:20 Miroslav Šulc
2024-01-05 10:09 Sam James
2024-01-05 8:28 Sam James
2024-01-05 8:13 Sam James
2024-01-03 8:56 Sam James
2024-01-03 8:51 Sam James
2023-04-20 4:02 Sam James
2023-04-20 4:02 Sam James
2023-04-19 18:09 Arthur Zamarin
2023-02-07 21:49 Maciej Barć
2022-11-09 10:29 Miroslav Šulc
2022-06-25 12:19 Miroslav Šulc
2022-02-24 1:24 Maciej Barć
2022-02-24 1:24 Maciej Barć
2021-07-26 23:20 Marek Szuba
2021-02-15 8:25 Miroslav Šulc
2021-02-14 14:53 Sam James
2021-02-12 14:15 Sam James
2021-02-12 13:55 Sam James
2021-01-14 10:46 Miroslav Šulc
2021-01-13 9:18 Sam James
2021-01-13 9:17 Sam James
2021-01-12 22:37 Sam James
2021-01-12 12:50 Miroslav Šulc
2020-10-07 7:09 Agostino Sarubbo
2020-10-07 6:42 Agostino Sarubbo
2020-10-06 15:06 Sam James
2020-09-17 7:30 Miroslav Šulc
2020-09-17 7:30 Miroslav Šulc
2020-09-06 7:07 Miroslav Šulc
2020-09-06 4:11 Sam James
2020-09-05 22:55 Sam James
2020-09-05 16:17 Thomas Deutschmann
2020-09-05 11:22 Miroslav Šulc
2020-09-05 8:31 Miroslav Šulc
2020-08-07 12:05 Miroslav Šulc
2020-08-07 11:53 Agostino Sarubbo
2020-08-07 11:44 Agostino Sarubbo
2020-08-05 23:14 Sam James
2020-08-05 8:32 Miroslav Šulc
2020-08-05 8:22 Miroslav Šulc
2020-07-28 8:45 Ulrich Müller
2020-07-05 9:33 Miroslav Šulc
2020-06-10 13:42 Miroslav Šulc
2020-06-09 13:53 Agostino Sarubbo
2020-06-09 13:45 Agostino Sarubbo
2020-06-09 4:23 Mart Raudsepp
2020-06-08 8:04 Miroslav Šulc
2020-04-02 10:38 Miroslav Šulc
2020-02-16 14:51 Andreas Sturmlechner
2020-02-16 13:41 Andreas Sturmlechner
2019-12-02 11:21 Miroslav Šulc
2019-12-01 15:38 Thomas Deutschmann
2019-11-29 21:54 Aaron Bauman
2019-11-29 8:59 Agostino Sarubbo
2019-11-04 7:28 Tim Harder
2019-10-28 10:54 Miroslav Šulc
2019-04-14 14:37 Aaron Bauman
2019-03-23 13:48 Pacho Ramos
2018-03-23 6:39 Tim Harder
2018-03-18 12:11 Mikle Kolyada
2018-03-18 0:40 Thomas Deutschmann
2018-03-17 18:22 Matt Turner
2018-01-06 19:53 Ulrich Müller
2017-11-30 14:47 Patrice Clement
2017-11-30 14:47 Patrice Clement
2017-11-30 14:47 Patrice Clement
2017-11-30 14:47 Patrice Clement
2017-07-29 11:32 Tim Harder
2017-07-10 7:37 Tim Harder
2017-07-10 7:37 Tim Harder
2017-06-30 7:39 Alexis Ballier
2017-05-24 6:06 Tim Harder
2017-05-20 14:49 Tim Harder
2017-04-12 10:43 Tim Harder
2017-04-03 8:34 Tim Harder
2017-03-25 9:03 Tim Harder
2017-03-01 13:54 Tim Harder
2017-02-22 20:57 Tim Harder
2017-01-22 9:00 Tobias Klausmann
2017-01-06 2:30 Tim Harder
2017-01-06 2:30 Tim Harder
2016-12-26 20:22 Tim Harder
2016-12-12 19:41 Michał Górny
2016-12-09 3:25 Tim Harder
2016-11-12 5:10 Tim Harder
2016-11-12 5:09 Tim Harder
2016-10-26 4:07 Tim Harder
2016-09-30 4:46 Tim Harder
2016-09-01 3:10 Tim Harder
2016-08-20 23:23 Tim Harder
2016-08-19 2:20 Tim Harder
2016-08-19 2:20 Tim Harder
2016-08-19 2:20 Tim Harder
2016-08-19 2:15 Tim Harder
2016-05-30 12:10 Tobias Klausmann
2015-11-10 6:12 Ian Delaney
2015-11-10 6:12 Ian Delaney
2015-11-10 6:12 Ian Delaney
2015-11-06 12:18 Ian Delaney
2015-08-28 9:39 Miroslav Šulc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465767165.f7824d6e3a2dd6874157d9fc4f008987d49aa89f.monsieurp@gentoo \
--to=monsieurp@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox