version bump, drop old ebuilds

(Portage version: 2.2.11-r1/cvs/Linux x86_64, signed Manifest commit with key B658FA13)

6 files changed, 33 insertions, 197 deletions

diff --git a/sys-cluster/corosync/ChangeLog b/sys-cluster/corosync/ChangeLog
index 6d6b6be9c000..4ecffde9f74c 100644
--- a/sys-cluster/corosync/ChangeLog
+++ b/sys-cluster/corosync/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/corosync
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.30 2013/10/17 12:39:46 ultrabug Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/ChangeLog,v 1.31 2014/08/12 15:27:41 ultrabug Exp $
+
+*corosync-2.3.3 (12 Aug 2014)
+*corosync-1.4.7 (12 Aug 2014)
+
+  12 Aug 2014; Ultrabug <ultrabug@gentoo.org> -corosync-1.3.3-r1.ebuild,
+  -corosync-1.4.3-r1.ebuild, -corosync-1.4.4.ebuild, +corosync-1.4.7.ebuild,
+  -corosync-2.3.1.ebuild, -corosync-2.3.2.ebuild, +corosync-2.3.3.ebuild:
+  version bump, drop old ebuilds
 
 *corosync-2.3.2 (17 Oct 2013)
 
diff --git a/sys-cluster/corosync/corosync-1.3.3-r1.ebuild b/sys-cluster/corosync/corosync-1.3.3-r1.ebuild
deleted file mode 100644
index 957d4f4c8f0c..000000000000
--- a/sys-cluster/corosync/corosync-1.3.3-r1.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.3.3-r1.ebuild,v 1.2 2012/05/04 07:20:30 jdhore 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
-}
diff --git a/sys-cluster/corosync/corosync-1.4.4.ebuild b/sys-cluster/corosync/corosync-1.4.4.ebuild
deleted file mode 100644
index 8058e7353cc9..000000000000
--- a/sys-cluster/corosync/corosync-1.4.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-1.4.4.ebuild,v 1.2 2013/01/18 10:22:53 ultrabug Exp $
-
-EAPI=4
-
-inherit base autotools
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="mirror://github/corosync/corosync/${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-r1.ebuild b/sys-cluster/corosync/corosync-1.4.7.ebuild
index bbb67a7c6c0c..d5a269e0d0d4 100644
--- a/sys-cluster/corosync/corosync-1.4.3-r1.ebuild
+++ b/sys-cluster/corosync/corosync-1.4.7.ebuild
@@ -1,14 +1,16 @@
-# 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/corosync/corosync-1.4.3-r1.ebuild,v 1.1 2012/07/11 08:30:55 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-1.4.7.ebuild,v 1.1 2014/08/12 15:27:41 ultrabug Exp $
 
 EAPI=4
 
-inherit base autotools
+inherit autotools base
+
+MY_TREE="bf8ff17"
 
 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"
+SRC_URI="https://github.com/corosync/corosync/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
@@ -31,6 +33,8 @@ PATCHES=(
 
 DOCS=( README.recovery README.devmap SECURITY TODO AUTHORS )
 
+S="${WORKDIR}/${PN}-${PN}-${MY_TREE}"
+
 src_prepare() {
 	base_src_prepare
 	eautoreconf
diff --git a/sys-cluster/corosync/corosync-2.3.1.ebuild b/sys-cluster/corosync/corosync-2.3.1.ebuild
deleted file mode 100644
index 51c737bc4e55..000000000000
--- a/sys-cluster/corosync/corosync-2.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.3.1.ebuild,v 1.1 2013/08/29 10:30:17 ultrabug Exp $
-
-EAPI=4
-
-inherit autotools base
-
-MY_TREE="024ae2a"
-
-DESCRIPTION="OSI Certified implementation of a complete cluster engine"
-HOMEPAGE="http://www.corosync.org/"
-SRC_URI="https://github.com/corosync/corosync/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="BSD-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc infiniband static-libs"
-
-# TODO: support those new configure flags
-# --enable-watchdog : Watchdog support
-# --enable-augeas : Install the augeas lens for corosync.conf
-# --enable-snmp : SNMP protocol support
-# --enable-xmlconf : XML configuration support
-# --enable-systemd : Install systemd service files
-RDEPEND="!sys-cluster/heartbeat
-	infiniband? (
-		sys-infiniband/libibverbs
-		sys-infiniband/librdmacm
-	)
-	dev-libs/nss
-	>=sys-cluster/libqb-0.14.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( sys-apps/groff )"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-docs.patch" )
-
-DOCS=( README.recovery SECURITY TODO AUTHORS )
-
-S="${WORKDIR}/${PN}-${PN}-${MY_TREE}"
-
-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 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-2.3.2.ebuild b/sys-cluster/corosync/corosync-2.3.3.ebuild
index 4a7b958be66e..3df5bacf7fc4 100644
--- a/sys-cluster/corosync/corosync-2.3.2.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 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/corosync/corosync-2.3.2.ebuild,v 1.1 2013/10/17 12:39:46 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/corosync/corosync-2.3.3.ebuild,v 1.1 2014/08/12 15:27:41 ultrabug Exp $
 
 EAPI=4
 
 inherit autotools base
 
-MY_TREE="2c7906d"
+MY_TREE="32ec81c"
 
 DESCRIPTION="OSI Certified implementation of a complete cluster engine"
 HOMEPAGE="http://www.corosync.org/"
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/corosync/corosync/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="doc infiniband static-libs"
 
 # TODO: support those new configure flags
@@ -66,3 +66,14 @@ src_install() {
 	keepdir /var/lib/corosync
 	use static-libs || rm -rf "${D}"/usr/$(get_libdir)/*.a || die
 }
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 2.0 ]]; then
+		ewarn "!! IMPORTANT !!"
+		ewarn " "
+		ewarn "Migrating from a previous version of corosync can be dangerous !"
+		ewarn " "
+		ewarn "Make sure you backup your cluster configuration before proceeding"
+		ewarn " "
+	fi
+}
\ No newline at end of file