From 4838e3721c21375e887f66c154b25b7a4bab7a8c Mon Sep 17 00:00:00 2001
From: Alexys Jacob <ultrabug@gentoo.org>
Date: Wed, 11 Jul 2012 08:30:55 +0000
Subject: Remove non-Gentoo init script, fix #425718.

(Portage version: 2.1.11.5/cvs/Linux x86_64)
---
 sys-cluster/corosync/ChangeLog                |  8 +++-
 sys-cluster/corosync/corosync-1.4.3-r1.ebuild | 60 +++++++++++++++++++++++++++
 sys-cluster/corosync/corosync-1.4.3.ebuild    | 59 --------------------------
 3 files changed, 67 insertions(+), 60 deletions(-)
 create mode 100644 sys-cluster/corosync/corosync-1.4.3-r1.ebuild
 delete mode 100644 sys-cluster/corosync/corosync-1.4.3.ebuild

(limited to 'sys-cluster/corosync')

diff --git a/sys-cluster/corosync/ChangeLog b/sys-cluster/corosync/ChangeLog
index 4eb00429575c..b76570a439eb 100644
--- a/sys-cluster/corosync/ChangeLog
+++ b/sys-cluster/corosync/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/corosync
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.22 2012/05/16 12:39:47 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.23 2012/07/11 08:30:55 ultrabug Exp $
+
+*corosync-1.4.3-r1 (11 Jul 2012)
+
+  11 Jul 2012; Ultrabug <ultrabug@gentoo.org> -corosync-1.4.3.ebuild,
+  +corosync-1.4.3-r1.ebuild:
+  Remove non-Gentoo init script, fix #425718.
 
 *corosync-2.0.0 (16 May 2012)
 
diff --git a/sys-cluster/corosync/corosync-1.4.3-r1.ebuild b/sys-cluster/corosync/corosync-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..bbb67a7c6c0c
--- /dev/null
+++ b/sys-cluster/corosync/corosync-1.4.3-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-1.4.3-r1.ebuild,v 1.1 2012/07/11 08:30:55 ultrabug Exp $
+
+EAPI=4
+
+inherit base autotools
+
+DESCRIPTION="OSI Certified implementation of a complete cluster engine"
+HOMEPAGE="http://www.corosync.org/"
+SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
+IUSE="doc infiniband ssl static-libs"
+
+RDEPEND="!sys-cluster/heartbeat
+	ssl? ( dev-libs/nss )
+	infiniband? (
+		sys-infiniband/libibverbs
+		sys-infiniband/librdmacm
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( sys-apps/groff )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-docs.patch"
+)
+
+DOCS=( README.recovery README.devmap SECURITY TODO AUTHORS )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# appends lib to localstatedir automatically
+	# FIXME: install just shared libs --disable-static does not work
+	econf \
+		--localstatedir=/var \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable doc) \
+		$(use_enable ssl nss) \
+		$(use_enable infiniband rdma)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	rm "${D}"/etc/init.d/corosync-notifyd || die
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	keepdir /var/lib/corosync
+	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.a || die
+}
diff --git a/sys-cluster/corosync/corosync-1.4.3.ebuild b/sys-cluster/corosync/corosync-1.4.3.ebuild
deleted file mode 100644
index 91a861304b5a..000000000000
--- a/sys-cluster/corosync/corosync-1.4.3.ebuild
+++ /dev/null
@@ -1,59 +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/corosync/corosync-1.4.3.ebuild,v 1.1 2012/05/16 09:39:24 ultrabug Exp $
-
-EAPI=4
-
-inherit base autotools
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="ftp://ftp:${PN}.org@${PN}.org/downloads/${P}/${P}.tar.gz"
-
-LICENSE="BSD-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
-IUSE="doc infiniband ssl static-libs"
-
-RDEPEND="!sys-cluster/heartbeat
-	ssl? ( dev-libs/nss )
-	infiniband? (
-		sys-infiniband/libibverbs
-		sys-infiniband/librdmacm
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( sys-apps/groff )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-docs.patch"
-)
-
-DOCS=( README.recovery README.devmap SECURITY TODO AUTHORS )
-
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	# appends lib to localstatedir automatically
-	# FIXME: install just shared libs --disable-static does not work
-	econf \
-		--localstatedir=/var \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable doc) \
-		$(use_enable ssl nss) \
-		$(use_enable infiniband rdma)
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-
-	keepdir /var/lib/corosync
-	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.a || die
-}
-- 
cgit v1.2.3-65-gdbad