diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-01-13 21:40:21 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-01-13 21:40:21 +0000 |
| commit | 2624ec60a62cd5b1efc6ebe8241632a80f6ba8be (patch) | |
| tree | 4046b4730ad0fec2dc5eab16099a1ccefbba4790 /app-misc | |
| parent | Version bump, drop old. Update license (bug #451852, thanks to Ulrich Müller). (diff) | |
| download | gentoo-2-2624ec60a62cd5b1efc6ebe8241632a80f6ba8be.tar.gz gentoo-2-2624ec60a62cd5b1efc6ebe8241632a80f6ba8be.tar.bz2 gentoo-2-2624ec60a62cd5b1efc6ebe8241632a80f6ba8be.zip | |
fix build with ocaml4, bug #451426
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/wyrd/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/wyrd/files/ocaml4.patch | 20 | ||||
| -rw-r--r-- | app-misc/wyrd/wyrd-1.4.5.ebuild | 11 |
3 files changed, 35 insertions, 4 deletions
diff --git a/app-misc/wyrd/ChangeLog b/app-misc/wyrd/ChangeLog index 851e23e040df..fa4ea8aa3a40 100644 --- a/app-misc/wyrd/ChangeLog +++ b/app-misc/wyrd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/wyrd -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/ChangeLog,v 1.22 2012/07/29 17:16:50 armin76 Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/ChangeLog,v 1.23 2013/01/13 21:40:20 aballier Exp $ + + 13 Jan 2013; Alexis Ballier <aballier@gentoo.org> +files/ocaml4.patch, + wyrd-1.4.5.ebuild: + fix build with ocaml4, bug #451426 29 Jul 2012; Raúl Porcel <armin76@gentoo.org> wyrd-1.4.4.ebuild, wyrd-1.4.5.ebuild: diff --git a/app-misc/wyrd/files/ocaml4.patch b/app-misc/wyrd/files/ocaml4.patch new file mode 100644 index 000000000000..50967e5305e9 --- /dev/null +++ b/app-misc/wyrd/files/ocaml4.patch @@ -0,0 +1,20 @@ +Index: wyrd-1.4.5/configure.ac +=================================================================== +--- wyrd-1.4.5.orig/configure.ac ++++ wyrd-1.4.5/configure.ac +@@ -61,6 +61,7 @@ echo "ocaml library path is $OCAMLLIB" + # check for sufficient OCAMLVERSION + OCAMLMAJORVERSION=`echo $OCAMLVERSION | cut -d '.' -f 1` + OCAMLMINORVERSION=`echo $OCAMLVERSION | cut -d '.' -f 2` ++if test $OCAMLMAJORVERSION -lt 4 ; then + if test $OCAMLMAJORVERSION -lt 3 ; then + AC_MSG_ERROR(Wyrd requires OCaml version 3.08 or greater.) + else +@@ -68,6 +69,7 @@ else + AC_MSG_ERROR(Wyrd requires OCaml version 3.08 or greater.) + fi + fi ++fi + + + # then we look for ocamlopt; if not present, we issue a warning diff --git a/app-misc/wyrd/wyrd-1.4.5.ebuild b/app-misc/wyrd/wyrd-1.4.5.ebuild index c3772d3a708e..f81df9fba269 100644 --- a/app-misc/wyrd/wyrd-1.4.5.ebuild +++ b/app-misc/wyrd/wyrd-1.4.5.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/wyrd-1.4.5.ebuild,v 1.2 2012/07/29 17:16:50 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/wyrd-1.4.5.ebuild,v 1.3 2013/01/13 21:40:20 aballier Exp $ EAPI=4 +inherit eutils autotools + DESCRIPTION="Text-based front-end to Remind" HOMEPAGE="http://pessimization.com/software/wyrd/" SRC_URI="http://pessimization.com/software/wyrd/${P}.tar.gz" @@ -21,6 +23,11 @@ DEPEND="${RDEPEND} >=dev-lang/ocaml-3.08 " +src_prepare() { + epatch "${FILESDIR}/ocaml4.patch" + eautoreconf +} + src_configure() { econf \ $(use_enable unicode utf8) |