drop vulnerable wrt #457572

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

4 files changed, 5 insertions, 156 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 7c10e0bf0919..ede955e819fd 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.41 2015/04/02 16:44:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.42 2015/04/07 08:10:44 ultrabug Exp $
+
+  07 Apr 2015; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.0.10.ebuild,
+  -pacemaker-1.0.12.ebuild, metadata.xml:
+  drop vulnerable wrt #457572
 
   02 Apr 2015; Jeroen Roovers <jer@gentoo.org> pacemaker-1.1.12-r2.ebuild:
   Stable for HPPA (bug #539608).
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index e36a21bf761c..f18bd7f45ec8 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -8,7 +8,6 @@
 	  capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
    </longdescription>
    <use>
-	   <flag name="ais">Enable <pkg>sys-cluster/openais</pkg> support.</flag>
 	   <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
 	   <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
 	   <flag name="smtp">Enable SMTP support via <pkg>net-libs/libsmtp</pkg></flag>
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
deleted file mode 100644
index c7615ae76c55..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.7 2014/12/02 14:45:32 ultrabug Exp $
-
-EAPI="2"
-
-MY_PN="Pacemaker"
-MY_P="${MY_PN}-${PV}"
-PYTHON_DEPEND="2"
-inherit python autotools multilib eutils base flag-o-matic
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.clusterlabs.org/"
-SRC_URI="http://hg.clusterlabs.org/${PN}/stable-1.0/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="+ais heartbeat smtp snmp static-libs"
-
-RDEPEND="
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/resource-agents
-	ais? ( sys-cluster/openais )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-	!heartbeat? ( !ais? ( sys-cluster/openais ) )
-	!sys-cluster/crmsh
-"
-DEPEND="${RDEPEND}
-	!=dev-libs/glib-2.32*
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
-	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-1-0-${MY_P}"
-
-pkg_setup() {
-	if ! use ais && ! use heartbeat; then
-		ewarn "You disabled both cluster implementations"
-		ewarn "Silently enabling OpenAIS/CoroSync support."
-	fi
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -e "s:<glib/ghash.h>:<glib.h>:" \
-		-i lib/ais/plugin.c || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-
-	use heartbeat || use ais || myopts="--with-ais"
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with ais) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
deleted file mode 100644
index c39da3eb9127..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.4 2014/12/02 14:45:32 ultrabug Exp $
-
-EAPI="2"
-
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-PYTHON_DEPEND="2"
-
-inherit autotools base python
-
-MY_TREE="066152e"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}-1.0/tarball/${MY_P} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+ais heartbeat smtp snmp static-libs"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/resource-agents
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-	!sys-cluster/crmsh
-"
-RDEPEND="${DEPEND}
-	!=dev-libs/glib-2.32*
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
-	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
-	"${FILESDIR}/1.0.12-BUILD_VERSION.patch"
-)
-
-S="${WORKDIR}/ClusterLabs-${PN}-1.0-${MY_TREE}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -e "s:<glib/ghash.h>:<glib.h>:" \
-		-i lib/ais/plugin.c || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-	use heartbeat || myopts="--with-ais"
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	base_src_install
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}