Respect LDFLAGS wrt bug 339197. Thanks to Diego for the report. Simplify ebuild, correct dependencies. Drop old.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

4 files changed, 56 insertions, 46 deletions

diff --git a/sys-cluster/pconsole/ChangeLog b/sys-cluster/pconsole/ChangeLog
index d73566b23919..b20b2e5bbd26 100644
--- a/sys-cluster/pconsole/ChangeLog
+++ b/sys-cluster/pconsole/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/pconsole
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pconsole/ChangeLog,v 1.11 2010/06/02 06:44:10 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pconsole/ChangeLog,v 1.12 2010/10/14 17:33:41 xarthisius Exp $
+
+*pconsole-1.0-r3 (14 Oct 2010)
+
+  14 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -pconsole-1.0-r2.ebuild, +pconsole-1.0-r3.ebuild:
+  Respect LDFLAGS wrt bug 339197. Thanks to Diego for the report. Simplify
+  ebuild, correct dependencies. Drop old.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove tantive from metadata.xml (#200343)
diff --git a/sys-cluster/pconsole/Manifest b/sys-cluster/pconsole/Manifest
index ea07b9ef0340..92c887dfcd9d 100644
--- a/sys-cluster/pconsole/Manifest
+++ b/sys-cluster/pconsole/Manifest
@@ -3,15 +3,15 @@ Hash: SHA1
 
 AUX pconsole-1.0-exit-warn.patch 248 RMD160 7b0d4525a01ff55a21c65dda34e699da867f469d SHA1 99c69a2747904ae9f6ff61957a027b53d487e417 SHA256 4d2f01afc46cbc67fecbebf0173fda19aca7b3a5666230cd237727432518598b
 DIST pconsole-1.0.tar.gz 215426 RMD160 64545616d8a5b0e312e8d33976268de6c64318b1 SHA1 5c841e90548263671b6903a31cde6101154a20a3 SHA256 94520bf65f726df9d7e686bb486e9a2828c29d09a20b9522f1da4f7d66700bb2
-EBUILD pconsole-1.0-r2.ebuild 955 RMD160 afe4e71b7f7477e4714ac9220840996a9edf726b SHA1 cb50e64f0717c11545680127c9d0e848adb26d85 SHA256 b5474d053107d07b09da38e3a5d7b24a5011e5fb49f2dfa44e3293ab613b8eaa
-MISC ChangeLog 1669 RMD160 186570de4c2df210ce878e2e1ea946be28953e1a SHA1 da0b3cf0310c59a4b3771eb2ec5de9de1ac250b2 SHA256 e022e76a58b7e9bf65e74f0f8442ed0119136f539c678addf31337f725f1479d
+EBUILD pconsole-1.0-r3.ebuild 941 RMD160 393d1c5eaa4eecc675b5c628ea47f70abcb04726 SHA1 e91e3fff0515c00cb4749b0b2a2be3f7a64b163f SHA256 0ce3b6312b23e0d16d6b19c9e82757dc8ca41984282ba62b66b0eea23a8913e6
+MISC ChangeLog 1931 RMD160 b4ee42f6e10fe87040b0310bfa0fd23b57659dce SHA1 1b31f3c0dd165a86653793e94841844c061e62f3 SHA256 5883bb04e78db905e67bd6b7ff845b04e59aba1aefbb3e9bd4ae87b1e4bc2c8d
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkyKi08ACgkQIiMqcbOVdxS/zwP/cKem0OLmZML7wDh5l8R4iIKL
-Y1G1yrR7pDhuIluRQsdrWMpaJjutJpYjjjw51BwhxSbSHjg2J4HF21aVb/gJRKIE
-rkCh+mbqh+1qR+l4Tqz0nl7Ya+hfXwzjFL3tEha7otS/OQOEIrMOfIemMYh5a6Lk
-a60oRY6SGVFOFg2RMMI=
-=p8eP
+iJwEAQECAAYFAky3PwIACgkQIiMqcbOVdxRf9wP/RJIPsjJtP+KLVfP4V6Cub8nP
+mO+ydupUv35c1pK3ZofjqNPAqYaxeRVIWyhiBWvBN1pSOXTg9zlwC7QN9mT+cGzs
+s641kBQTXXKQoL0Jjp+v4DtXZtYpUvuhBMxRQXcv1pY4/ILztcbfGXf1TYtsnnUO
++MHhGcMvk9dQAYTfhtM=
+=2hKJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pconsole/pconsole-1.0-r2.ebuild b/sys-cluster/pconsole/pconsole-1.0-r2.ebuild
deleted file mode 100644
index 3b8bde4fc115..000000000000
--- a/sys-cluster/pconsole/pconsole-1.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pconsole/pconsole-1.0-r2.ebuild,v 1.3 2009/10/13 18:46:17 haubi Exp $
-
-inherit autotools eutils
-
-DESCRIPTION="Tool for managing multiple xterms simultaneously."
-HOMEPAGE="http://www.heiho.net/pconsole/"
-SRC_URI="http://www.xs4all.nl/~walterj/pconsole/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND="virtual/ssh"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch ${FILESDIR}/${P}-exit-warn.patch || einfo "Never mind.."
-	sed -i \
-		-e "s:\(CCOPTS=\).*:\1'${CFLAGS}':g" \
-		"${S}"/configure.in
-	eautoreconf
-}
-
-src_install() {
-	einstall bindir="${D}/usr/bin" || die "install failed"
-	fperms 4111 /usr/bin/pconsole
-	dodoc ChangeLog public_html/pconsole.html README.pconsole
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "Warning:"
-	ewarn "pconsole installed with suid root!"
-	ewarn
-}
diff --git a/sys-cluster/pconsole/pconsole-1.0-r3.ebuild b/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
new file mode 100644
index 000000000000..581dc6cf825a
--- /dev/null
+++ b/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pconsole/pconsole-1.0-r3.ebuild,v 1.1 2010/10/14 17:33:41 xarthisius Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool for managing multiple xterms simultaneously."
+HOMEPAGE="http://www.heiho.net/pconsole/"
+SRC_URI="http://www.xs4all.nl/~walterj/pconsole/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/ssh"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-exit-warn.patch
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin pconsole || die
+	fperms 4110 /usr/bin/pconsole || die
+	dodoc ChangeLog README.pconsole || die
+	dohtml public_html/pconsole.html || die
+}
+
+pkg_postinst() {
+	echo
+	ewarn "Warning:"
+	ewarn "pconsole installed with suid root!"
+	echo
+}