3 files changed, 57 insertions, 58 deletions
diff --git a/app-doc/NaturalDocs/ChangeLog b/app-doc/NaturalDocs/ChangeLog
index 372820355f2d..f9767f81b1d7 100644
--- a/app-doc/NaturalDocs/ChangeLog
+++ b/app-doc/NaturalDocs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-doc/NaturalDocs
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/ChangeLog,v 1.20 2008/03/12 10:10:00 phreak Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/ChangeLog,v 1.21 2009/03/29 16:33:25 matsuu Exp $
+
+*NaturalDocs-1.40 (29 Mar 2009)
+
+  29 Mar 2009; MATSUU Takuto <matsuu@gentoo.org>
+  -NaturalDocs-1.22-r1.ebuild, +NaturalDocs-1.40.ebuild:
+  Version bumped. Fixed locations. Removed old version.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Josh Glover (jmglov, #206782) from metadata.xml.
diff --git a/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild b/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild
deleted file mode 100644
index 5da131986f3e..000000000000
--- a/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/NaturalDocs-1.22-r1.ebuild,v 1.11 2007/01/19 13:55:23 masterdriverz Exp $
-
-DESCRIPTION="Extensible, multi-language source code documentation generator"
-HOMEPAGE="http://www.naturaldocs.org/"
-SRC_URI="mirror://sourceforge/naturaldocs/${P}.zip mirror://sourceforge/naturaldocs/${P}-Patch-3.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_unpack() {
-	mkdir ${P} || die "could not create directory ${P}"
-	cd ${P}
-	unzip ${DISTDIR}/${P}.zip
-
-	# See if we have a patch. If we have more than one, use the highest-
-	# numbered one *only*
-	local patch=`ls -r ${DISTDIR}/${P}-Patch-?.zip | head -n -1`
-
-	# If we have a patch, it is actually a whole new Perl module. Just
-	# unzip it over top of the original one.
-	if [ -n "${patch}" ]; then
-		einfo Applying patch: `basename ${patch}`
-		unzip -o ${patch}
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-	# Install Perl script, modules, and other supporting stuff
-	dodir /usr/share/NaturalDocs
-	cp -pPR NaturalDocs ${D}/usr/share/NaturalDocs/
-	cp -pPR Modules Project Styles ${D}/usr/share/NaturalDocs/
-
-	# Make the Perl script executable
-	chmod a+x ${D}/usr/share/NaturalDocs/NaturalDocs
-
-	# Symlink the Perl script into /usr/bin
-	dodir /usr/bin
-	dosym /usr/share/NaturalDocs/NaturalDocs /usr/bin/NaturalDocs
-
-	# Documentation
-	dodoc *.txt
-	dohtml -r Help/*
-}
diff --git a/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild b/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild
new file mode 100644
index 000000000000..37312682ea47
--- /dev/null
+++ b/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-doc/NaturalDocs/NaturalDocs-1.40.ebuild,v 1.1 2009/03/29 16:33:25 matsuu Exp $
+
+inherit perl-module
+
+MY_P="${PN}-1.4"
+DESCRIPTION="Extensible, multi-language source code documentation generator"
+HOMEPAGE="http://www.naturaldocs.org/"
+SRC_URI="mirror://sourceforge/naturaldocs/${MY_P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	!<app-doc/NaturalDocs-1.40" # for dosym
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r Styles Info JavaScript
+
+	insinto /etc/${PN}
+	doins -r Config/*
+	dosym /etc/${PN} /usr/share/${PN}/Config
+
+	perlinfo
+	insinto ${VENDOR_LIB}
+	doins -r Modules/NaturalDocs
+	dodir /usr/share/${PN}/Modules
+	dosym ${VENDOR_LIB}/NaturalDocs /usr/share/${PN}/Modules/NaturalDocs
+
+	exeinto /usr/share/${PN}
+	doexe ${PN}
+
+	# Symlink the Perl script into /usr/bin
+	dodir /usr/bin
+	dosym /usr/share/${PN}/${PN} /usr/bin/${PN}
+
+	# Documentation
+	dohtml -r Help/*
+	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/Help
+}