fix corosync version dep wrt #531762

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

4 files changed, 23 insertions, 55 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/Manifest b/sys-cluster/openais/Manifest
index 02c6f12600f1..72b6684de8bf 100644
--- a/sys-cluster/openais/Manifest
+++ b/sys-cluster/openais/Manifest
@@ -1,5 +1,14 @@
-DIST openais-1.1.4.tar.gz 566559 RMD160 0cfbd13961fa28cecb13df389b7b007bd62706c5 SHA1 c8fc8055bd9974253bc35051b51220da4a7e8ef6 SHA256 974b4959f3c401c16156dab31e65a6d45bbf84dd85a88c2a362712e738c06934
-EBUILD openais-1.1.4-r1.ebuild 1200 RMD160 ffab0a6f9cc35d00b6a7fa8b7a81cbdc1ac48ebd SHA1 f9472013d33090734c8d47e9622fc142c10aa3bd SHA256 9f07a7c995ff9766f9411192cf7add8b20ffd92dc72917198939d722f1a1fa1b
-EBUILD openais-1.1.4.ebuild 1123 RMD160 4a46d2e0fc1bb44582e3b5a6ebf025c2fc17d1ea SHA1 fb0520c314dd8839d66a1fcec920c7b33353203f SHA256 44251536a22e4afc2b3353c7fc3d6c071362cf72353e3f39945f5ef8c4e5527b
-MISC ChangeLog 1815 RMD160 93215421cf0bc8a34524fc1b8eda81d6fc397bea SHA1 7ebdbc7c565617ccd8f08a80294db0b967a4d389 SHA256 213f4d0bacbd3793510222fe6e593efb4189188ba9047b59f22826a0967f1e3e
-MISC metadata.xml 726 RMD160 d197b59c3810b8ae4f9f8f586d499d6713ec85f0 SHA1 86467862d4b838077f924d7e92c804d71cef01c7 SHA256 14542e948dbd99b94e83da687a3b744d22063a9ab166cc7e02d54f2434e51a08
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST openais-1.1.4.tar.gz 566559 SHA256 974b4959f3c401c16156dab31e65a6d45bbf84dd85a88c2a362712e738c06934
+EBUILD openais-1.1.4-r1.ebuild 1209 SHA256 0d6beae9dffc4ecf3211719bb819ebef80537c74c3b438bd103d5b26f74457b4 SHA512 973f00ca9151dc3fbc933e68d30a59b81920ea4703ffb9d7c9e4034018f0862487a9d93bacb0cd7112b428ec9535266d28e1e311ff838866094d720fbe525d7b WHIRLPOOL 4ac5d2a1923908a4b40e46ff6351e500d284943beb6a9d0fa6bc90e10f197701d84caef66c8541a226674de8d0ee9cc410f04ce9f96a5ce4a2e64a8982fa3210
+MISC ChangeLog 1953 SHA256 df717398231bebc6312dadadf9f1bdabd988c44581f3671ffc224396e12d465c SHA512 8d7613bd919b801ebdc20b6106574823a1ff509aef6e53b156d59937978423a5584a5ddeef5e66feed2ef922ecf23f21b8ec449ece2850581908420b54268d19 WHIRLPOOL 08932130de25fcdfa4e03c1caf547010cb6e9d71eb51b82b27472d0a3f6cf5e8d299cedcedeb1f2425419e304ad815645f0704ae9fcd4658b13572a30cae4734
+MISC metadata.xml 726 SHA256 14542e948dbd99b94e83da687a3b744d22063a9ab166cc7e02d54f2434e51a08 SHA512 f00e971d082608b9ae2fd7ed2a73321b4a65a92d7b41c7a48b17c48295926e763f80538ab2c8a7d7fa3fe286b8239dd7489859c7c347ac157208c1b6aa4bad73 WHIRLPOOL 47c8950513a78f1eb57ee2d6c9de0b74ab7b5bf5ed61b8ea81a12af5956ab03ea3aac0e836d20a6078732f97bea902cc04ba88021438d1a87b7825be6e0003f7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlSQAdkACgkQKiQSS7ZY+hPWDAEA5VK/qk5cGTkocUnsNuK1cqnT
+HVj/zAmCJBDnIGOr/Q4A/3Pa/BBIV8D7QSQva9mlEdMsYqxMYn6IVjdpD96BP8Vh
+=0VUu
+-----END PGP SIGNATURE-----
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
-}