Fix documentation install path, bug #305579, EAPI2, and remove old

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

4 files changed, 56 insertions, 53 deletions

diff --git a/net-misc/nxcl/ChangeLog b/net-misc/nxcl/ChangeLog
index 001651f00617..7412ec4409e2 100644
--- a/net-misc/nxcl/ChangeLog
+++ b/net-misc/nxcl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nxcl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcl/ChangeLog,v 1.9 2009/03/08 15:31:48 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcl/ChangeLog,v 1.10 2010/02/19 17:27:15 voyageur Exp $
+
+*nxcl-0.9-r2 (19 Feb 2010)
+
+  19 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org> -nxcl-0.9.ebuild,
+  +nxcl-0.9-r2.ebuild:
+  Fix documentation install path, bug #305579, EAPI2, and remove old
 
   08 Mar 2009; Markus Meier <maekke@gentoo.org> nxcl-0.9-r1.ebuild:
   amd64/x86 stable, bug #256414
diff --git a/net-misc/nxcl/Manifest b/net-misc/nxcl/Manifest
index 9dba070fcd9b..cbf416103f7d 100644
--- a/net-misc/nxcl/Manifest
+++ b/net-misc/nxcl/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nxcl-0.9-gcc43.patch 931 RMD160 797757feba3aaf8e64356426bbb0702babea3bd7 SHA1 73f0a131a096fdadfad760795d6aceeb67574333 SHA256 f07141589114982e4aec77dce92971037f57bf6cf8f56c481e978795c4d44bd3
 AUX nxcl-0.9-no_nxssh.patch 11470 RMD160 305835916e7931b019289256a6a670712de12f4e SHA1 153da2349d6fa46154e588e51f6403cf15bed49a SHA256 a15875efae333eec432765ee4edb0d3cabfaf0d8130cd19d2ab5255cb6e9a687
 DIST freenx-client-0.9.tar.bz2 46240 RMD160 5877799311afaed8def94f167955171a08248e1f SHA1 cbe7f4d4c83e435d74192a07290a42cd42cb6242 SHA256 dfc6c8dd89c26171411d8f7fa92613004eb8947ff509459151fdb03de7fe9608
 EBUILD nxcl-0.9-r1.ebuild 1059 RMD160 5050364e6fbff93ecfb1e51c0f05f192b3200f3d SHA1 b274bea26e81f1dde868220f5da19dd29ba42c93 SHA256 69fc0d9d5e6dec9e2d9e5f5c99464ea88cc5ce998a770bc415c0159092846b7b
-EBUILD nxcl-0.9.ebuild 891 RMD160 8339b1ea60d99e8b5f002281c092fb7b38ac0873 SHA1 9e670affb988b740979829e128e8bb03b91be772 SHA256 05e5039289f7969bf9191d6aab7fca4d262898756df19de562a2fdd9e1ce2d85
-MISC ChangeLog 1331 RMD160 f42b4df98c80683ffdc3d802d381bcaa06d62138 SHA1 d7653689a151f9164539d7dc6558624f1dbf5cfc SHA256 6c5ec7461d46c279d5a45a7325ad926343246ee2e98e222020c5eb7c2ff965d8
+EBUILD nxcl-0.9-r2.ebuild 1220 RMD160 dd046221061ca0beb3dea09e264d789398092e48 SHA1 8a36c306474d58ba945c0781028a1e2464a1a261 SHA256 d2f756b920ea16c151808515348f0e724744373bb966563ea49e0d9a346b4561
+MISC ChangeLog 1528 RMD160 2ef319b797b08df855c40a37949927c5911410e8 SHA1 a2a18339c80bd12417f1f5ce3a9df4d1dbb63d28 SHA256 f3d4830fb6c46008948be398c9fd85f749ba52759e8c2725ffd76d9cf49a6e34
 MISC metadata.xml 340 RMD160 a5d0fe4e34fd6fc1d93a35c9c2e16836e8525087 SHA1 83dd7279bae9933464e1dcfd49abb37bc02ce25b SHA256 afdb0242dc9daf0db276be4f69861fde54eeca28395b2eab8def563cef228b74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmz5OsACgkQkKaRLQcq0GKNgwCeL1l0BPgFm1kXCJ1bauBQ+ggF
-pM8An35NLe/z3oS6/MoiWlQXvUtuGIMH
-=vuXe
------END PGP SIGNATURE-----
diff --git a/net-misc/nxcl/nxcl-0.9-r2.ebuild b/net-misc/nxcl/nxcl-0.9-r2.ebuild
new file mode 100644
index 000000000000..2f64b1365584
--- /dev/null
+++ b/net-misc/nxcl/nxcl-0.9-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcl/nxcl-0.9-r2.ebuild,v 1.1 2010/02/19 17:27:15 voyageur Exp $
+
+EAPI=2
+
+inherit autotools
+
+MY_P="freenx-client-${PV}"
+DESCRIPTION="A library for building NX clients"
+HOMEPAGE="http://developer.berlios.de/projects/freenx/"
+SRC_URI="mirror://berlios/freenx/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus doc nxclient"
+
+RDEPEND=">=net-misc/nx-3.2.0-r5
+	dbus? ( sys-apps/dbus )
+	nxclient? ( net-misc/nxclient )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+S="${WORKDIR}/${MY_P}/${PN}"
+
+src_prepare() {
+	# Incorrect version
+	sed -i -e "s#1.0#0.9#" configure.ac || die "version sed failed"
+	# And doc path
+	sed -i -e "/^docdir =/s#doc/.*#share/doc/${PF}#" doc/Makefile.am ||
+		die "doc path sed failed"
+	if ! use nxclient; then
+		# Patch to use standard ssh instead of nxssh from nxclient
+		epatch "${FILESDIR}"/${P}-no_nxssh.patch
+	fi
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with doc doxygen) || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+}
diff --git a/net-misc/nxcl/nxcl-0.9.ebuild b/net-misc/nxcl/nxcl-0.9.ebuild
deleted file mode 100644
index 228793629ec0..000000000000
--- a/net-misc/nxcl/nxcl-0.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxcl/nxcl-0.9.ebuild,v 1.6 2008/09/10 09:12:14 voyageur Exp $
-
-inherit autotools
-
-MY_P="freenx-client-${PV}"
-DESCRIPTION="A library for building NX clients"
-HOMEPAGE="http://developer.berlios.de/projects/freenx/"
-SRC_URI="mirror://berlios/freenx/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus doc"
-
-RDEPEND="net-misc/nx
-	net-misc/nxclient
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-S="${WORKDIR}/${MY_P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_with doc doxygen) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-}