Fix use of python-single-r1. python_convert_shebangs -> python_fix_shebang. Replace base.eclass inherit. Remove broken versions.

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

4 files changed, 39 insertions, 111 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 013c853c14e0..f76167eeb21f 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pacemaker
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.36 2014/12/12 13:41:15 ultrabug Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.37 2015/01/01 23:01:41 mgorny Exp $
+
+*pacemaker-1.1.12-r1 (01 Jan 2015)
+
+  01 Jan 2015; Michał Górny <mgorny@gentoo.org> +pacemaker-1.1.12-r1.ebuild,
+  -pacemaker-1.1.10.ebuild, -pacemaker-1.1.12.ebuild:
+  Fix use of python-single-r1. python_convert_shebangs -> python_fix_shebang.
+  Replace base.eclass inherit. Remove broken versions.
 
 *pacemaker-1.1.12 (12 Dec 2014)
 
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 191e6ca58c88..863e72c9c170 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -10,19 +10,29 @@ AUX pacemaker-1.1.10-tinfo.patch 767 SHA256 5ed6ba9d70df8c288005cf73d9080cd84299
 AUX pacemaker.initd 981 SHA256 9c081cbbf9e3843d61f8175e430f82414bd21661b6b7fb31f74b9c6c64874204 SHA512 ebf1fa1043dda01e1409960f6a0b13284186644e4ced9e348e61ac137c4d8151aa4bf82740fc553a347d19e547f61f5f08d7bd24ce2247dfeae38e7648945103 WHIRLPOOL edc3634278151e5c88082768b71281cc8cd1dd5b191ac93da219b0024a30e29fad538b904a99805b55d20ebec7212c7d8e4269524a846ece117a8aa442ab7c7e
 AUX pacemaker.service 105 SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b WHIRLPOOL ec891f83ec9f561060b08bd39e9e0ecf5b243617958bd68f07a2f087a881af85895a4f25f810657ababb6d4541dfcc63e59e195fb6006717dc0cb69a1f869376
 DIST Pacemaker-1.0.10.tar.bz2 6642704 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9 SHA512 ceed7414ce14d136205d35f4e3e11aa0c5b57b3e0069486ea2b9827d3f78f69ff216474348d3360f31ace06d1071f9287ae3300a495391509c2fb43407fc2711 WHIRLPOOL 3ac764ddcf00eebd851fdd69398670bb4cb5c083f89c6e770759463da8b1fb0f0ca03c0bb134386c45703e0db7b50139e466ba71ded72647131abde4301c283f
-DIST Pacemaker-1.1.10.tar.gz 10184661 SHA256 aba417c8a719d380d7bac741f26d2af8f7264d96828f3cf059a3c48fc9741ab4 SHA512 7d975704ab560fcca66f9d9d389e029321e2032bc3d41975ead8295b3f692163a446d981ac20d471b1e7f9ae75b4c65e622b9db88211f0541a17d7a16e9a2d78 WHIRLPOOL 06e2ef217cbfb1429be1fc0844072d337229f4e77376523be66d133cb352554cf0544cc2af6442556672849af036ee0c0cb22e0fc660e46c4cb96baddbe210d0
 DIST Pacemaker-1.1.12.tar.gz 10459675 SHA256 f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c SHA512 cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1 WHIRLPOOL e737d70288936d2f76d310848940bde78537c32e703c68d8dd37a78e54a66dc9d34cf2fe0037f1621fbc5ba10bb9688490da96394cde65f0668d4b62eccf3f03
 DIST pacemaker-1.0.12.tar.gz 7481273 SHA256 a3b4ea4106eda19ff5569bf0631168454b481fbfd23342421010832cce0a504e SHA512 a6944318cfbddaacfd87dda82be9c377af85cb9f92f913d785f5e8a060c23480a972efc0b255af9ad7c1bbd0f7c5ee57f5e7d9797fe3b2549f4c31c7751c1d86 WHIRLPOOL 2f707c4f74c235b358fff50b4e60069b4c16c9fac5114a74ba75d6aca85c67c56b43f49d1496f876b55e652585d4908e060306cb2a3579e2b15b15d0c2b217f5
 EBUILD pacemaker-1.0.10.ebuild 1821 SHA256 41dddec72a5191be4e23813b97c86d1e89e0f99f846fd16c60772305453cae44 SHA512 c1027dc88f9ae5f28d6345708f6acbf23d4f743ed1e3e06bbc98ebae9acf0fcdc6181daa9f17a4fe9a8f3fef980d7c00d2897bc7e15f12c6f03a148d06dbc913 WHIRLPOOL b9ddd7393ca68564a06e9c3ce5ba46774e645a623d1607b5939c6eb86e2faa82ae0a7023aca27b73f3136156cb60d0da65a63523fdb28afdf7843d8fe727f7f4
 EBUILD pacemaker-1.0.12.ebuild 1791 SHA256 0b5b4b664f6719abbaca3175015d4fc344424360e7651fe4815029f96e302a9c SHA512 c467e326f50922a3c84139c40a567596ec8d81a1c312972a4069c5d6bdd9c5545c55ad48466c139b7352f456d3633fa77bec886202173d1e147cc400646dcb55 WHIRLPOOL 9672495439b1fd1b2f814e8a12bcf71e53edea992399fc7b6416cee195540647a4f6aca243757dac3744673cade98a150f5b0891c91393141ab3eefdfc40dce0
-EBUILD pacemaker-1.1.10.ebuild 2338 SHA256 53a1342ca827d4484068c5a145c3b6fb8bc974a433d6250135f897f7dc83f024 SHA512 4d6f3b3593261e191bcafb37b7b5f53482d1898c94960898fedac9ff36948ff3d667c0426fd5393aeaea458422c69967c20d7819bfa0cf81437190fab59a7994 WHIRLPOOL 611280eb890842b8d52a0cf905deb5c819a0797d78bf9b049610ff51b78d8f307d7ac2343c6c2bfe399835b3f10635ebc63df1c3b2a5130d386cf6970c777de7
-EBUILD pacemaker-1.1.12.ebuild 2274 SHA256 5e802a42d3b2721d950aacdae54bd0dbb051f3c8e7edffbc09a0cf1d24bf7bec SHA512 84bfdb4de1f9637ecaf669d2ad4e8e470feb94819bd2b06b3792ff16eb742b1b2a75387231d096c728f3e5f192fa2d266d00217dad08579b7efb7629045caccd WHIRLPOOL 40c0d8c5b198038aa62c3124e3e4184534731d16f11f48f454fd27e84d8bc07bcd15d27ae7cdc733da6783bab966ae00d34c3fcd2b32abd3b9f5bb2a715368e6
-MISC ChangeLog 6974 SHA256 d9802f3ea1d79754a06f5107fcde57d62ba64d3e2b13e08dc72511a6e95693f0 SHA512 1e4b1198e1032750de080f78cc094c64376d425617239ea335a808ef1abe40fab2cbffa5d1d6854ba7628278188be539e27d9bf23ad78827bc4b9cf19df97500 WHIRLPOOL 20871fd359214fcf900c1555aec230a1d23c138bb01f53630fbd9552c58395882fdab6a9855f8cbfb69fcb9aa8c2571f6b54116323ac99fd0540779e9405cea8
+EBUILD pacemaker-1.1.12-r1.ebuild 2324 SHA256 bd159e799be7355688f80ddb60863df5e62b28bb9f1f6e4414cac80a7e8718ad SHA512 b70e3784c1543e2ea6a410a1a6290482d3067db013ebfd90568ad68e49298a94c81d339308256d630807f9eb0ee363f7804b1b51a0fc77c06f6e63286d4c08a2 WHIRLPOOL 7562b0374e2c70ff37cd35defa99a387a0a644f3ceeb7d8b11430fa185dc03acbd1a006cabd6a84c076f06d2e8b0bc08824149e50abc291fbe3b8972c6860a27
+MISC ChangeLog 7275 SHA256 f902ef91748fa49caa9bd9187c208dff53a4ad2fb5ba4e4bf543c659a0506cea SHA512 8cdbadcfb4f95d0183d2c8a92e48c892b919957d6fe4bf4287c821967ad40035ed3b9c856a7d236fde8e70036500d5378eb5258f306d44c8e27270cca6dc769d WHIRLPOOL 056c85d5d80c3c6107b4029228142ff79c97dda289fe0e4bd2771fa1c518b0ae299fe2a989e9c832098f53ad6191bc0f4ed843b932a6b4e5441450e09d1a88eb
 MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSK8H8ACgkQKiQSS7ZY+hOAJAD6Az/0u/Ei9RHZF55Tkg32m3V+
-hYkFRa5eb5kVYaZu3ZIBANv6+OkHv41EcRUdKffHr15CzZr1Hbyzq8ZPR85tjBjS
-=h5Bn
+iQJ8BAEBCABmBQJUpdHWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGJUP/R6R0qdoGoBCedL9vHaWFWws
+6P5qorN+2hu+vOYbDUKq8vcn0CRZlDWkbBArVLm5wlLPu5inDoU7M1VHnZhEctm9
+83XuDGf3k5fiGCHx+uugrpnpkDG53R7fT+48EdBtPjBE1Rg0UzV3EbN6lkUghVKS
+G51mO41Zw+7HrFtokRaHzCuA4tzpXm5aMLf9pbCcsmdHgYx6Frarp/SJqtYAb/IW
++7tKejg0Zt8LbTMQUzFjxGVAmrxLT9ZsbS1Lvhdwm8oRxfHjkujmpMXxLnP84zG8
+UQPhAnpGkeNXX+PA0vFrV7H1YxVz+29TyWtsR34BXYcVUm7yL6I3+iLnbLRF1nER
+GH2qWesozs9HPzvGA2RIMZXd95sQ1cCbjWeyx6LUJKdm+So3SZuvPoRgHTtNGl25
+am7wKqh0ibrsu2JJHgrxOl8N6mM3YDcyGXrWmTv81OxZalo4EfsMwCIpFj2QbX7c
+ea8IW4FtYpIimbEI7M2XiCKc/ldK161aGXHPk2zleXZnvnptaO9mOI8Cnmr46VGM
+IGym2c1L85PvzbPF73M+qQLp9+QYdnOZY/abUaChCDX/NYgrL8Rs4T7XccuFmpwf
+1ShEspW2hl+su4v0HPjiarrSjIUZRTOI2fbShbNWTezdzaBsBzTQ5JlTjS2Gf+sI
+hWlgzD9PyIj+JgfwiVxx
+=lP+W
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
deleted file mode 100644
index 06a5fca6d93e..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.1.10.ebuild
+++ /dev/null
@@ -1,94 +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.1.10.ebuild,v 1.2 2014/12/12 13:41:15 ultrabug Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
-WANT_AUTOMAKE="1.12"
-
-inherit autotools base python-single-r1
-
-MY_PN="Pacemaker"
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}/archive/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-REQUIRED_USE="cman? ( !heartbeat )"
-IUSE="acl cman heartbeat smtp snmp static-libs"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	>=sys-cluster/libqb-0.14.0
-	sys-cluster/resource-agents
-	cman? ( sys-cluster/cman )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}"/pacemaker-1.1.10-tinfo.patch)
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -i -e "s/ -ggdb//g" configure.ac || die
-	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
-	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
-	eautoreconf
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	local myopts=""
-	if use heartbeat ; then
-		myopts="--without-corosync"
-	else
-		myopts="--with-ais"
-	fi
-	# appends lib to localstatedir automatically
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with acl) \
-		$(use_with cman cs-quorum) \
-		$(use_with cman cman) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	base_src_install
-	rm -rf "${D}"/var/run "${D}"/etc/init.d
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	if has_version "<sys-cluster/corosync-2.0"; then
-		insinto /etc/corosync/service.d
-		newins "${FILESDIR}/${PN}.service" ${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	elog " "
-	elog "Looking for the crm CLI ? emerge sys-cluster/crmsh !"
-	elog " "
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12-r1.ebuild
index 42d5718243e0..c7030410e23b 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.12-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12.ebuild,v 1.1 2014/12/12 13:41:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.12-r1.ebuild,v 1.1 2015/01/01 23:01:41 mgorny Exp $
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 WANT_AUTOMAKE="1.12"
 
-inherit autotools base python-single-r1
+inherit autotools eutils python-single-r1
 
 MY_PN="Pacemaker"
 MY_P=${MY_PN}-${PV/_/-}
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~hppa ~x86"
 REQUIRED_USE="cman? ( !heartbeat )"
 IUSE="acl cman heartbeat smtp snmp static-libs"
 
-DEPEND="
+DEPEND="${PYTHON_DEPS}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
@@ -35,18 +35,23 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
 PATCHES=("${FILESDIR}"/pacemaker-1.1.10-tinfo.patch)
 
 S="${WORKDIR}/${PN}-${MY_P}"
 
 src_prepare() {
-	base_src_prepare
+	epatch "${PATCHES[@]}"
+	epatch_user
+
 	sed -i -e "/ggdb3/d" configure.ac || die
 	sed -i -e "s/ -ggdb//g" configure.ac || die
 	sed -i -e "s/uid2username(uid)/uid2username(uid_client)/g" lib/common/ipc.c || die
 	sed -i -e "s:<glib/ghash.h>:<glib.h>:" lib/ais/plugin.c || die
 	eautoreconf
-	python_convert_shebangs -r 2 .
+
+	python_fix_shebang .
 }
 
 src_configure() {
@@ -73,7 +78,7 @@ src_configure() {
 }
 
 src_install() {
-	base_src_install
+	default
 	rm -rf "${D}"/var/run "${D}"/etc/init.d
 	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
 	if has_version "<sys-cluster/corosync-2.0"; then