Drop unused eclasses, quotes, pacemaker -> PN

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 32 insertions, 23 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 2daa6b5e8b33..d067c5ce84e0 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.13 2011/07/08 13:47:33 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.14 2011/07/08 14:02:02 xarthisius Exp $
+
+  08 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> pacemaker-1.0.11.ebuild,
+  pacemaker-1.1.5.ebuild:
+  Drop unused eclasses, quotes, pacemaker -> PN
 
 *pacemaker-1.1.5 (08 Jul 2011)
 
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index f16a445be0e7..9c2c21c07d11 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -12,15 +12,17 @@ DIST Pacemaker-1.0.11.tar.bz2 6706773 RMD160 6ab3dbccf537a2b635a87b0089307b53097
 DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1
 DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
 EBUILD pacemaker-1.0.10.ebuild 1704 RMD160 6f11269269bf3ec33d8f9ac0ea91c3f43d273644 SHA1 8ea2440ed206ecf371ee5d2937d0589776a8008e SHA256 fc5b74f7ee393bf6875591f9a7f34b9d2fe49ba52b79d58e2ed6478bc838d28b
-EBUILD pacemaker-1.0.11.ebuild 1712 RMD160 455c4b219d7a624072bf161ab77eef10c8d7e163 SHA1 aaa9c39bfeff11bd6f292a9a990e6145da1cc3c6 SHA256 289e83c763d2d35c78c45a229bad65793d385fae111fa4fcd5c9184d697f2cce
+EBUILD pacemaker-1.0.11.ebuild 1695 RMD160 d5fa6f353a4e7b08b3c2448068cd54b8e5aa6109 SHA1 93dfb0e07e33fdc3411121970112ca4d2b6041b3 SHA256 241df375f211ae31e5c77d17caf9b70798d90b121d47ecc31c2869a88781fab6
 EBUILD pacemaker-1.1.4-r4.ebuild 2155 RMD160 04f78cbea02a19add3a438efdda2fd9fe2b60358 SHA1 b7736c48625691174b1e6a6b825b46152b96fe46 SHA256 02220c06c7a40aac92a096011f746432450105081e6ba4fbcaa43efc4e804a08
-EBUILD pacemaker-1.1.5.ebuild 2172 RMD160 d0a7ad662bc327d7ef4dcd572b130dbadd5cfe41 SHA1 1082aebce52bc1492e2dc12839983bbbafdae4ca SHA256 65ca356fb86e075ce93d1e7d74556f2010709abe4aa8872b8612355381426c51
-MISC ChangeLog 2552 RMD160 7b4fd71093b89f735465c7b63c6072029290e94b SHA1 fd1fa3769355d6c54f28c82442785600b78c64f6 SHA256 00efe91761bca813c463e8b2ae748207daffb52d69e644bc600f5738d8c9c638
+EBUILD pacemaker-1.1.5.ebuild 2124 RMD160 9e9b7071aeaa839fa93ec63b6c4dfc9450f8911e SHA1 6f6cafd914164af691e0e73af95d91ffceded090 SHA256 cb27205eb4b9aaa1fee1fc4b94d2d06692df1c78c5861bfe5c1e112afab35e44
+MISC ChangeLog 2708 RMD160 14c33106d8d823eca0e9e886cd11967406f86a53 SHA1 816689eec94961d065acc4da5d0967eb7a123dba SHA256 6f051f6452be1b7ac96995619eeea74db846c2a81869a8ce37703092899ee3df
 MISC metadata.xml 797 RMD160 c99dc189163047b32ad1915b13e33cc01a407481 SHA1 c9a83889da12df16797e7436751e184440ef9537 SHA256 904067d2d16de829ccfc138dde85ea965db6d680b4cea293105542a5a8b9ca52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4XCn4ACgkQKiQSS7ZY+hMikAD+JFTMvStIDlGmCoS8+isUSseS
-Zf9ssofBzcv3EjwktyUBALotK/P19NhmYdzfRkV0qIf/GkE6Qr116pA6/067R4E7
-=YYP2
+iJwEAQEIAAYFAk4XDeQACgkQIiMqcbOVdxRLKQP+Ow6A7+TCyQ529BISIANXtamY
+dhpTwvSClWLS7mjrW/CK8Xn6CFLp/KlXEtccPl9YqBTSwtTFyWMXlKc3ClmM0chD
+m8s+z7uytPQxY40Tb4H7DSfd1++NjCa/GMRciUH0rgqE/J8Qdk/DnPOxtvRK3/Ex
+tNXEjaYlZzpJJ1vxNDo=
+=IXC6
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild
index 9c7b18451cec..61bae38013b9 100644
--- a/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild,v 1.1 2011/07/05 07:28:53 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.11.ebuild,v 1.2 2011/07/08 14:02:02 xarthisius Exp $
 
 EAPI="2"
 
-MY_PN="Pacemaker"
-MY_P="${MY_PN}-${PV}"
+MY_PN=Pacemaker
+MY_P=${MY_PN}-${PV}
 PYTHON_DEPEND="2"
-inherit python autotools multilib eutils base flag-o-matic
+
+inherit autotools base python
 
 DESCRIPTION="Pacemaker CRM"
 HOMEPAGE="http://www.clusterlabs.org/"
@@ -18,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="+ais heartbeat smtp snmp static-libs"
 
-RDEPEND="
+DEPEND="
 	dev-libs/libxslt
 	sys-cluster/cluster-glue
 	sys-cluster/resource-agents
@@ -28,14 +29,14 @@ RDEPEND="
 	snmp? ( net-analyzer/net-snmp )
 	!heartbeat? ( !ais? ( sys-cluster/openais ) )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
 	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
 )
 
-S="${WORKDIR}/${MY_PN}-1-0-${MY_P}"
+S=${WORKDIR}/${MY_PN}-1-0-${MY_P}
 
 pkg_setup() {
 	if ! use ais && ! use heartbeat; then
@@ -56,7 +57,9 @@ src_prepare() {
 src_configure() {
 	local myopts=""
 
-	use heartbeat || use ais || myopts="--with-ais"
+	if ! use ais && ! use heartbeat; then
+		myopts="--with-ais"
+	fi
 	# appends lib to localstatedir automatically
 	econf \
 		--localstatedir=/var \
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
index 3c0247b032d6..bf42f1e9d2da 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.1 2011/07/08 13:47:33 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild,v 1.2 2011/07/08 14:02:02 xarthisius Exp $
 
 EAPI=3
 
-inherit autotools base eutils flag-o-matic multilib python
+inherit autotools base python
 
-MY_PN="Pacemaker"
-MY_P="${MY_PN}-${PV}"
+MY_PN=Pacemaker
+MY_P=${MY_PN}-${PV}
 PYTHON_DEPEND="2"
 
 DESCRIPTION="Pacemaker CRM"
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="acl heartbeat smtp snmp static-libs"
 
-RDEPEND="
+DEPEND="
 	dev-libs/libxslt
 	sys-cluster/corosync
 	sys-cluster/cluster-glue
@@ -28,7 +28,7 @@ RDEPEND="
 	smtp? ( net-libs/libesmtp )
 	snmp? ( net-analyzer/net-snmp )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-autotools.patch"
@@ -67,9 +67,9 @@ src_configure() {
 
 src_install() {
 	base_src_install
-	newinitd "${FILESDIR}/pacemaker.initd" pacemaker || die
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
 	insinto /etc/corosync/service.d
-	newins "${FILESDIR}/pacemaker.service" pacemaker || die
+	newins "${FILESDIR}/${PN}.service" ${PN} || die
 }
 
 pkg_postinst() {