diff options
author | Alexys Jacob <ultrabug@gentoo.org> | 2014-12-16 09:56:37 +0000 |
---|---|---|
committer | Alexys Jacob <ultrabug@gentoo.org> | 2014-12-16 09:56:37 +0000 |
commit | eac10f6200bf3bff3a69957f4eb9b288d45078b9 (patch) | |
tree | c67983206a599d195594aaef60a698731ab4ec26 /sys-cluster | |
parent | Version bump (diff) | |
download | gentoo-2-eac10f6200bf3bff3a69957f4eb9b288d45078b9.tar.gz gentoo-2-eac10f6200bf3bff3a69957f4eb9b288d45078b9.tar.bz2 gentoo-2-eac10f6200bf3bff3a69957f4eb9b288d45078b9.zip |
fix corosync version dep wrt #531762
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/openais/ChangeLog | 8 | ||||
-rw-r--r-- | sys-cluster/openais/openais-1.1.4-r1.ebuild | 6 | ||||
-rw-r--r-- | sys-cluster/openais/openais-1.1.4.ebuild | 45 |
3 files changed, 9 insertions, 50 deletions
diff --git a/sys-cluster/openais/ChangeLog b/sys-cluster/openais/ChangeLog index a4f045fb6dff..ef74f33fcd9a 100644 --- a/sys-cluster/openais/ChangeLog +++ b/sys-cluster/openais/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/openais -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/ChangeLog,v 1.20 2012/05/04 07:20:30 jdhore Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/ChangeLog,v 1.21 2014/12/16 09:56:37 ultrabug Exp $ + + 16 Dec 2014; Ultrabug <ultrabug@gentoo.org> -openais-1.1.4.ebuild, + openais-1.1.4-r1.ebuild: + fix corosync version dep wrt #531762 04 May 2012; Jeff Horelick <jdhore@gentoo.org> openais-1.1.4.ebuild, openais-1.1.4-r1.ebuild: diff --git a/sys-cluster/openais/openais-1.1.4-r1.ebuild b/sys-cluster/openais/openais-1.1.4-r1.ebuild index c9b52ecc2c24..32ab443b53e8 100644 --- a/sys-cluster/openais/openais-1.1.4-r1.ebuild +++ b/sys-cluster/openais/openais-1.1.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/openais-1.1.4-r1.ebuild,v 1.5 2012/05/04 07:20:30 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/openais-1.1.4-r1.ebuild,v 1.6 2014/12/16 09:56:37 ultrabug Exp $ EAPI="2" @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 hppa x86 ~x86-fbsd" IUSE="static-libs" -RDEPEND="sys-cluster/corosync" +RDEPEND="<sys-cluster/corosync-2.0.0" DEPEND="${RDEPEND} virtual/pkgconfig" diff --git a/sys-cluster/openais/openais-1.1.4.ebuild b/sys-cluster/openais/openais-1.1.4.ebuild deleted file mode 100644 index cd9f3f691782..000000000000 --- a/sys-cluster/openais/openais-1.1.4.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openais/openais-1.1.4.ebuild,v 1.7 2012/05/04 07:20:30 jdhore Exp $ - -EAPI="2" - -inherit autotools base - -DESCRIPTION="Open Application Interface Specification cluster framework" -HOMEPAGE="http://www.openais.org/" -SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz" - -LICENSE="BSD public-domain" -SLOT="0" -KEYWORDS="amd64 hppa x86 ~x86-fbsd" -IUSE="" - -RDEPEND="sys-cluster/corosync" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( "${S}/AUTHORS" "${S}/README.amf" ) - -src_prepare() { - # respect CFLAGS - sed -i -e "s/\$OPT_CFLAGS \$GDB_FLAGS//" configure.ac || die - # respect LDFLAGS - sed -i -e "s/\$(CFLAGS) -shared/\$(CFLAGS) \$(LDFLAGS) -shared/" \ - services/Makefile.am || die - # don't install docs - sed -i -e "/^dist_doc/d" Makefile.am || die - eautoreconf -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - --docdir=/usr/share/doc/${PF} \ - --localstatedir=/var -} - -src_install() { - base_src_install - rm -rf "${D}"/etc/init.d/openais || die -} |