Fix man pages and docs installing, use correct CC, bug #246664

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.26-gentoo-r2 i686, RepoMan options: --force)

3 files changed, 40 insertions, 24 deletions

diff --git a/net-p2p/nap/ChangeLog b/net-p2p/nap/ChangeLog
index 532458e5b595..adef6952f4a6 100644
--- a/net-p2p/nap/ChangeLog
+++ b/net-p2p/nap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/nap
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nap/ChangeLog,v 1.20 2008/04/13 21:43:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nap/ChangeLog,v 1.21 2008/11/27 21:43:37 armin76 Exp $
+
+*nap-1.5.4-r1 (27 Nov 2008)
+
+  27 Nov 2008; Raúl Porcel <armin76@gentoo.org> -nap-1.5.4.ebuild,
+  +nap-1.5.4-r1.ebuild:
+  Fix man pages and docs installing, use correct CC, bug #246664
 
   13 Apr 2008; Petteri Räty <betelgeuse@gentoo.org> nap-1.5.4.ebuild:
   Remove RDEPEND on virtual/libc.
diff --git a/net-p2p/nap/nap-1.5.4-r1.ebuild b/net-p2p/nap/nap-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..5bd2016dd69a
--- /dev/null
+++ b/net-p2p/nap/nap-1.5.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nap/nap-1.5.4-r1.ebuild,v 1.1 2008/11/27 21:43:37 armin76 Exp $
+
+inherit toolchain-funcs
+
+IUSE=""
+DESCRIPTION="Console Napster/OpenNap client"
+HOMEPAGE="http://www.mathstat.dal.ca/~selinger/nap/"
+SRC_URI="http://www.mathstat.dal.ca/~selinger/nap/dist/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="ppc x86"
+LICENSE="as-is"
+
+src_unpack() {
+	unpack ${A}
+
+	# Install the docs in the right dir
+	sed -i -e "s~\$(prefix)/doc/nap~\$(prefix)/share/doc/${P}~g" \
+		"${S}"/doc/Makefile.in
+}
+
+src_compile() {
+	./configure --prefix="${D}"/usr --mandir="${D}"/usr/share/man || die "configure problem"
+	emake CC="$(tc-getCC)" || die "compile problem"
+}
+
+src_install() {
+	emake install || die "install problem"
+
+	dodoc AUTHORS COPYRIGHT ChangeLog NEWS README
+}
diff --git a/net-p2p/nap/nap-1.5.4.ebuild b/net-p2p/nap/nap-1.5.4.ebuild
deleted file mode 100644
index 246919dcf295..000000000000
--- a/net-p2p/nap/nap-1.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nap/nap-1.5.4.ebuild,v 1.4 2008/04/13 21:43:14 betelgeuse Exp $
-
-IUSE=""
-DESCRIPTION="Console Napster/OpenNap client"
-HOMEPAGE="http://www.mathstat.dal.ca/~selinger/nap/"
-SRC_URI="http://www.mathstat.dal.ca/~selinger/nap/dist/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="ppc x86"
-LICENSE="as-is"
-
-src_compile() {
-	./configure --prefix=${D}/usr || die "configure problem"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake install || die "install problem"
-
-	dodoc AUTHORS COPYRIGHT COPYING ChangeLog NEWS README
-}